Fix Assorted Issues In New Edits