Bug fix for truncation of numbers with trailing 0's and for issue with d...

...eleting a result being reported as being out of range

https://www.pivotaltracker.com/story/show/60636038
https://www.pivotaltracker.com/story/show/66558762