Fixing some synchronization issues

I'll revert that part. Anything else?