Quiet warnings about integer types.

With these changes I get a clean build with no warnings.