Fixtures foreign key fixes