Fixed edit field errors