Fixed minor things that were preventing compilation with ifort