Some more bug-fixes on routes