More fixing in the session synchronization.