Fixes to sessions