Change the way space/delete work in corner cases