cosmetic fixes for intel and msvc