Int types cleanup

Eisenhauer, Gregrequested to merge
github/fork/eisenhauer/IntTypesCleanup into master

Fix some integer types that were in compatible and hadn't been cleaned up.

Merge request reports