Update UnitsBased for proper enums
Merge pull request #3189 from joshmoore/units-fixes

Various minor fixes for units