Fixing apparent issues...
More fixing broken repository stuff