Merge pull request #274 from tksuoran/enum-fixes

Enum fixes