Minor changes to output