Fixes to build Gaudi with the Intel compiler

Closes GAUDI-1297 and GAUDI-1298

See merge request !318