Fixing enums so they behave per documentation