Fix the output files for most of the core