session support, shippable fixes