some fixes for nersc