Fixed some additional errors dealing with infinite values.