Handle slightly weirder repos