Minor mods to sessions