Use consistent integer types and formats