Fix potential intermittent failures related to configuration synchronization