Fixes in the dc/edit tmpl, refs #4613