diff --git a/src/lib/openjp2/mct.c b/src/lib/openjp2/mct.c
index 9bb01da4..6b678345 100644
--- a/src/lib/openjp2/mct.c
+++ b/src/lib/openjp2/mct.c
@@ -82,9 +82,9 @@ void opj_mct_encode(
 	OPJ_SIZE_T i;
 	const OPJ_SIZE_T len = n;
 	/* buffer are aligned on 16 bytes */
-	assert( (uintptr_t)c0 & 16 == 0 );
-	assert( (uintptr_t)c1 & 16 == 0 );
-	assert( (uintptr_t)c2 & 16 == 0 );
+	assert( ((uintptr_t)c0 & 0xf) == 0 );
+	assert( ((uintptr_t)c1 & 0xf) == 0 );
+	assert( ((uintptr_t)c2 & 0xf) == 0 );
 	
 	for(i = 0; i < (len & ~3U); i += 4) {
 		__m128i y, u, v;
diff --git a/src/lib/openjp2/opj_malloc.c b/src/lib/openjp2/opj_malloc.c
index 4c9de50f..85a5716b 100644
--- a/src/lib/openjp2/opj_malloc.c
+++ b/src/lib/openjp2/opj_malloc.c
@@ -67,7 +67,7 @@ static inline void *opj_aligned_realloc_n(void *ptr, size_t alignment, size_t si
   /* glibc doc states one can mixed aligned malloc with realloc */
   void *r_ptr = realloc( ptr, size );
   /* fast path */
-  if( (uintptr_t)r_ptr & alignment == 0 )
+  if( ((uintptr_t)r_ptr & alignment) == 0 )
     return r_ptr;
   /* this is non-trivial to implement a portable aligned realloc, so use a
    * simple approach where we do not need a function that return the size of an