Fix routes and stuff