Fixes to run on CHPC.