Fix some things for compile on cray