Changes needed by ICC/IFC compiler (Intel)