Fixes for edit, create