A set of minor fixes to support Cray compilers.