Fixing routes and defaults