Couple of bug fixes in delete
Couple of bug fixes in delete