changes after session manager code review