Formbuilder fixes