Seems to have fixed the pop-up errors on the edit form