Fixes of data changed issues