diff --git a/libcelt/entcode.h b/libcelt/entcode.h
index ea88d7ed..2bd82fed 100644
--- a/libcelt/entcode.h
+++ b/libcelt/entcode.h
@@ -72,7 +72,7 @@ int ec_byte_write_done(ec_byte_buffer *_b,int _start_bits_available,
 /*Decoding functions.*/
 void ec_byte_readinit(ec_byte_buffer *_b,unsigned char *_buf,ec_uint32 _bytes);
 int ec_byte_read(ec_byte_buffer *_b);
-unsigned char ec_byte_read_from_end(ec_byte_buffer *_b);
+int ec_byte_read_from_end(ec_byte_buffer *_b);
 /*Shared functions.*/
 static inline void ec_byte_reset(ec_byte_buffer *_b){
   _b->offs=_b->end_offs=0;
diff --git a/libcelt/entdec.c b/libcelt/entdec.c
index c8b7df41..93c68791 100644
--- a/libcelt/entdec.c
+++ b/libcelt/entdec.c
@@ -48,7 +48,7 @@ int ec_byte_read(ec_byte_buffer *_b){
   return _b->offs<_b->storage?_b->buf[_b->offs++]:0;
 }
 
-unsigned char ec_byte_read_from_end(ec_byte_buffer *_b){
+int ec_byte_read_from_end(ec_byte_buffer *_b){
   return _b->end_offs<_b->storage?_b->buf[_b->storage-++(_b->end_offs)]:0;
 }
 
diff --git a/libcelt/rangedec.c b/libcelt/rangedec.c
index a0685544..7dce4a10 100644
--- a/libcelt/rangedec.c
+++ b/libcelt/rangedec.c
@@ -211,7 +211,7 @@ int ec_dec_cdf(ec_dec *_this,const unsigned *_cdf,unsigned _ftb){
 ec_uint32 ec_dec_bits(ec_dec *_this,unsigned _bits){
   ec_window window;
   int       available;
-  int       ret;
+  ec_uint32 ret;
   window=_this->end_window;
   available=_this->nend_bits;
   if(available<_bits){