Fix bugs in metrics change save