Fix compatibility with internal calls for repository