Fix some minor Linux spatch / conversions