Fixed more synchronization issues