Further tweaking for persistent sessions