Resolved synchronisation issues