Fix up data