Routing errors fixed