small changes for nersc compatibility