Make some types wider to be warning free on OS X