Fix round 5 issues and improve synchronization.