Fix cases of missing, swapped, or duplicated messages