Misc #0000: fixes for using the intel compiler.