Fixes for data types. Obfuscation caused the types not to match
the specification.