Fix repo handling