Fix the way we produce stderr/stdout