Fixed synchronization issues