Fixed saving for related objects