Compiler support

Some tweaks to support the Intel C compiler.