A few small changes to accomodate NERSC compiler