canadian units (and us units fixes)