session related fixups