Fix server, client-side update-round bugs