Bug fixes in Route object