Add some more session life-cycle goop