Fix issues and allow for no repository management