Synchronize bugs fixed