Fixes for canceling and editing