Ensure services & msgs are rpeserved on update