fixes embeds, associations