session-related tweaks