Fixes from using latest DOAP form generator