* Minor synchronization fixes