Fixed a few more integer width issues.