Routing and request context tweaks