Make some types wider to be warning free on OS X
Merge pull request #370 from alex/wider-types

Make some types wider to be warning free on OS X