Fix some warnings about integer sizes
Formatting