Add more logging around output file names