More synchronization changes