Further session dump refinements