fix up data definitions