Updates for UnifiedAPI

More int -> nint changes