Fixing Repository issues