Fix more code to match manager & repository split