Modified files to get rid of a bunch of compiler warnings that are picked up by
the Intel compilers.