Make unit comparison work properly