More int type fixes