Fix breakage caused by 785e866f.
Fix possible console corruption caused by output races.