Session storage madness fixes. Fixes #70.