Fix synchronisation issues