Minor corrections to get it compiled with Cray compilers