Fixes to enums stuff.