Make orchs consistent and fix repo updates