Some console output fixes