Fix up initial repo handling