Minor fixes to edit/show