Fix some of the endless supply of bugs in the indenter