Minor synchronization changes