Fix small oversight in calculating package name to download
Add some lock removals, and make it so that packages can be found from more than the first repository searched in