Fix synchronization issues.