Some more output fixes