Add and fix some UINT casts