Fixes in output formatting