WIP adjustments to try to resolve session issues