session support tweaks