U O M Fixes
Merge pull request #550 from sandal-smuggler/UOM-Fix-106

U O M Fixes