Some tweaks to get it to match our session data format.