More corrections to allow for units in speech