Fixes to Metadata editing