More metric/imperial craziness fix.