Fixes for delete 2