Updates to retain ifort compatibility and proper EE output files