Some output formatting fixes