Fixes for output files