Fix for Int/UInt differences, minor setup fix