Fix routes as per @jhladky's requests.