Small output bugfixes.