Some fixes for bug #8122.  It is now converting the data to the right units.