Serialization fix, flow fix to distinguish add/remove and update chunks