diff --git a/src/helper/types.h b/src/helper/types.h
index 587ed22c8..53249e5b7 100644
--- a/src/helper/types.h
+++ b/src/helper/types.h
@@ -177,44 +177,44 @@ static inline void h_u64_to_be(uint8_t *buf, uint64_t val)
 
 static inline void h_u32_to_le(uint8_t *buf, uint32_t val)
 {
-	buf[3] = (uint8_t) (val >> 24);
-	buf[2] = (uint8_t) (val >> 16);
-	buf[1] = (uint8_t) (val >> 8);
-	buf[0] = (uint8_t) (val >> 0);
+	buf[3] = (val >> 24) & 0xff;
+	buf[2] = (val >> 16) & 0xff;
+	buf[1] = (val >> 8) & 0xff;
+	buf[0] = (val >> 0) & 0xff;
 }
 
 static inline void h_u32_to_be(uint8_t *buf, uint32_t val)
 {
-	buf[0] = (uint8_t) (val >> 24);
-	buf[1] = (uint8_t) (val >> 16);
-	buf[2] = (uint8_t) (val >> 8);
-	buf[3] = (uint8_t) (val >> 0);
+	buf[0] = (val >> 24) & 0xff;
+	buf[1] = (val >> 16) & 0xff;
+	buf[2] = (val >> 8) & 0xff;
+	buf[3] = (val >> 0) & 0xff;
 }
 
 static inline void h_u24_to_le(uint8_t *buf, unsigned int val)
 {
-	buf[2] = (uint8_t) (val >> 16);
-	buf[1] = (uint8_t) (val >> 8);
-	buf[0] = (uint8_t) (val >> 0);
+	buf[2] = (val >> 16) & 0xff;
+	buf[1] = (val >> 8) & 0xff;
+	buf[0] = (val >> 0) & 0xff;
 }
 
 static inline void h_u24_to_be(uint8_t *buf, unsigned int val)
 {
-	buf[0] = (uint8_t) (val >> 16);
-	buf[1] = (uint8_t) (val >> 8);
-	buf[2] = (uint8_t) (val >> 0);
+	buf[0] = (val >> 16) & 0xff;
+	buf[1] = (val >> 8) & 0xff;
+	buf[2] = (val >> 0) & 0xff;
 }
 
 static inline void h_u16_to_le(uint8_t *buf, uint16_t val)
 {
-	buf[1] = (uint8_t) (val >> 8);
-	buf[0] = (uint8_t) (val >> 0);
+	buf[1] = (val >> 8) & 0xff;
+	buf[0] = (val >> 0) & 0xff;
 }
 
 static inline void h_u16_to_be(uint8_t *buf, uint16_t val)
 {
-	buf[0] = (uint8_t) (val >> 8);
-	buf[1] = (uint8_t) (val >> 0);
+	buf[0] = (val >> 8) & 0xff;
+	buf[1] = (val >> 0) & 0xff;
 }
 
 /**