Fetch proxy collections and a couple of other fixes.