Compiler support

Some minor tweaks to support the Intel C compiler (icc) adequately.