Fix race conditions in restore/load of change in client