Minor output fixes