latest fixes on repo classes