Tweaks to sessions