Fix various errors on 0.13.3.

This is still not passing tests, but should be very close.  It runs at
least.  I believe any remaining issues have to do with my changes to
SessionServer