Session expiration fixes from this morning.

Session expiration fixes from this morning.  Pulled down via FTP.