Minor changes to the output filename