Minor tweaks to work at NERSC