Fixing some synchronization issues

No looks fine otherwise