fixes for intel c++