Improving compatibility with ifort