Fix session handling.
9 files changed