Minor changes for output