changes for NERSC compatibility