Switch around vendor repos + fix derp