diff --git a/src/lib/openjp2/bio.c b/src/lib/openjp2/bio.c
index c3f92314..f4694069 100644
--- a/src/lib/openjp2/bio.c
+++ b/src/lib/openjp2/bio.c
@@ -78,7 +78,7 @@ opj_bool opj_bio_byteout(opj_bio_t *bio) {
 	if (bio->bp >= bio->end) {
 		return OPJ_FALSE;
 	}
-	*bio->bp++ = (unsigned char)(bio->buf >> 8); /* TODO MSD: check this conversion */
+	*bio->bp++ = (OPJ_BYTE)(bio->buf >> 8);
 	return OPJ_TRUE;
 }
 
@@ -94,7 +94,7 @@ opj_bool opj_bio_bytein(opj_bio_t *bio) {
 
 void opj_bio_putbit(opj_bio_t *bio, OPJ_UINT32 b) {
 	if (bio->ct == 0) {
-		opj_bio_byteout(bio); /* TODO_MSD: check this line */
+		opj_bio_byteout(bio); /* MSD: why not check the return value of this function ? */
 	}
 	bio->ct--;
 	bio->buf |= b << bio->ct;
@@ -102,7 +102,7 @@ void opj_bio_putbit(opj_bio_t *bio, OPJ_UINT32 b) {
 
 OPJ_UINT32 opj_bio_getbit(opj_bio_t *bio) {
 	if (bio->ct == 0) {
-		opj_bio_bytein(bio); /* TODO_MSD: check this line */
+		opj_bio_bytein(bio); /* MSD: why not check the return value of this function ? */
 	}
 	bio->ct--;
 	return (bio->buf >> bio->ct) & 1;
diff --git a/src/lib/openjp2/bio.h b/src/lib/openjp2/bio.h
index 53e0f0db..a69299b9 100644
--- a/src/lib/openjp2/bio.h
+++ b/src/lib/openjp2/bio.h
@@ -57,7 +57,7 @@ typedef struct opj_bio {
 	/** temporary place where each byte is read or written */
 	OPJ_UINT32 buf;
 	/** coder : number of bits free to write. decoder : number of bits read */
-	int ct;
+	OPJ_UINT32 ct;
 } opj_bio_t;
 
 /** @name Exported functions */