default controller and repo fixes