The same set of fixes for next delete.