Fixed unit conversions by moving to official standardized units