Ming Jin: fix unit conversions