- Some fixes for session management and handling