Fixes to routes