Small bug fixes for IFS project with ifort compiler