Round 11 Extended

Minor fixes in session management.