Fixing up sessions