Make repos.list work nicer, fix a dep bug