Session Mgmt Fixes