Routing + session fixes