WiP: Session Manager Fixes