small fixes for intel compiler