Fix up routes and router usage