More session data fixes.