Fixing some synchronisation issues