Fix change tracking on datastream