WIP: fix session tables