Entity fixes [Guest author/author switches]