Changes for Cray platform