Fix int types for nightly.