Fixed some compilation issues when using Intel compiler