Session fixes