Try to make some progress on session weirdness