Changes to enable build w/latest intel compiler.