Some minor fixes

To run on Regatta
Repo fix