Change a couple of enums and types from 16-bit to 32-bit to match spec