try to fix part of the int->uint mess