Small / semi-universal changes for formbuilder, etc.