Fix some routes and helpers