Fix up basic data