int/unsigned-int fixes