Major fixes with integer sizes