Repository fixes