Fix ifort compiles

Please don't merge yet. I'm trying to see what happens with the build bot, since I can't seem to reproduce the problem here.