Merge "Add some missing synchronization"