a few session-related improvements