Fixing Session issues