relational data fixes