Fixing session expiry issues