DiscontinuedRouteEvent and bug-fixes