Continued working to fix session issues