master: Making sure that clients get updated correctly