Fixes for delete