Cleaned up routing errors