Minor fixes to make sure compile with Intel C++