Some more small fixes for editing package metadata

and associated regressions :)