Fixing routes and auth