Minimal changes to build

Builds, does not start
Somehow dropped/added int/short conversion on TypeMap?

Switch back to 'int' like master, although 'short' is probably closer to
the truth.