Some cleanups in outputs