Small session bugfixes