Fix various ways the subtractPosition could screw things up