some fixes with deletes