Collection route and other fixes