Tilovell small fixes

Small fixes of a couple bugs introduced in editable metadata, and #1146