Fix some methods that would break use of repositories