Fixes and adjustments on the enums.