Bug fixes and routing errors