diff --git a/libr/include/r_types_base.h b/libr/include/r_types_base.h
index 604319de60..d83e2a8270 100644
--- a/libr/include/r_types_base.h
+++ b/libr/include/r_types_base.h
@@ -15,22 +15,22 @@
 #define R_TRUFAE 2
 
 /* limits */
-#define UT64_MAX 0xFFFFFFFFFFFFFFFFLL
-#define UT64_GT0 0x8000000000000000LL
-#define UT64_LT0 0x7FFFFFFFFFFFFFFFLL
-#define UT64_MIN 0LL
-#define UT64_32U 0xFFFFFFFF00000000LL
-#define UT64_16U 0xFFFFFFFFFFFF0000LL
-#define UT64_8U  0xFFFFFFFFFFFFFF00LL
-#define UT32_MIN 0
-#define UT32_GT0 0x80000000
-#define UT32_LT0 0x7FFFFFFF
+#define UT64_MAX 0xFFFFFFFFFFFFFFFFULL
+#define UT64_GT0 0x8000000000000000ULL
+#define UT64_LT0 0x7FFFFFFFFFFFFFFFULL
+#define UT64_MIN 0ULL
+#define UT64_32U 0xFFFFFFFF00000000ULL
+#define UT64_16U 0xFFFFFFFFFFFF0000ULL
+#define UT64_8U  0xFFFFFFFFFFFFFF00ULL
+#define UT32_MIN 0U
+#define UT32_GT0 0x80000000U
+#define UT32_LT0 0x7FFFFFFFU
 #define ST32_MAX 0x7FFFFFFF
-#define UT32_MAX 0xFFFFFFFF
-#define UT16_GT0 0x8000
-#define UT16_MAX 0xFFFF
-#define UT8_GT0  0x80
-#define UT8_MAX  0xFF
+#define UT32_MAX 0xFFFFFFFFU
+#define UT16_GT0 0x8000U
+#define UT16_MAX 0xFFFFU
+#define UT8_GT0  0x80U
+#define UT8_MAX  0xFFU
 
 /* copied from bithacks.h */
 #define B_IS_SET(x, n)   (((x) & (1<<(n)))?1:0)
diff --git a/swig/go/fixgoswig.sh b/swig/go/fixgoswig.sh
index 48e1bc01b5..b3d2c64963 100755
--- a/swig/go/fixgoswig.sh
+++ b/swig/go/fixgoswig.sh
@@ -7,7 +7,6 @@ sed -n '
 1!H
 $ {
 	g
-	s/\(\nconst UT[^\n]*\) int/\1 uint/g
 	s/\(\n\t[^\n(]*([^\n)]*)\) \([a-zA-Z0-9]\+\)Vector/\1 []\2/g
 	s/\(\nfunc ([^\n]*\) \([a-zA-Z0-9]\+\)Vector {\n\treturn \([^\n]*\)\n}/\1 []\2 {\
 	v := \3\