More optimisation of repo loading for #2