Fix up some data