Some better repo handleing