API Routing fixes