Compiler support

Tweaks to support the Intel C compiler (icc).