Fixes to item editing