Fixes to session settintgs