Use standard_output_file in a couple more places