Synchronisation ready.
two small fixes