Fix editing problem with references to Content objects