Sherpa fix
More fixes