diff --git a/cde/programs/dtdocbook/infolib/FlexBuffer.C b/cde/programs/dtdocbook/infolib/FlexBuffer.C
index ec083f3f7..5e3ab29bf 100644
--- a/cde/programs/dtdocbook/infolib/FlexBuffer.C
+++ b/cde/programs/dtdocbook/infolib/FlexBuffer.C
@@ -45,7 +45,7 @@ FlexBuffer::FlexBuffer()
 void
 FlexBuffer::grow(size_t needed)
 {
-  if(needed + 1 > (size_t) maxSize){
+  if(needed + 1 > maxSize){
     char *born = new char[maxSize = needed * 3 / 2 + 10];
     
     if(pos){
@@ -70,7 +70,7 @@ FlexBuffer::write(const char *d, size_t n)
 void
 FlexBuffer::writeStr(const char *str )
 {
-  int n = strlen(str);
+  size_t n = strlen(str);
   grow( pos + n );
   memcpy ( HeadPtr + pos, str, n );
   pos += n;
diff --git a/cde/programs/dtdocbook/infolib/FlexBuffer.h b/cde/programs/dtdocbook/infolib/FlexBuffer.h
index d685e2c4a..09ca61fb8 100644
--- a/cde/programs/dtdocbook/infolib/FlexBuffer.h
+++ b/cde/programs/dtdocbook/infolib/FlexBuffer.h
@@ -33,8 +33,8 @@ class FlexBuffer {
 friend ostream &operator<< ( ostream &s, FlexBuffer &);
 
 private:
-  int pos;
-  int maxSize;
+  size_t pos;
+  size_t maxSize;
   char *HeadPtr;
 
   void grow(size_t);
diff --git a/cde/programs/dtdocbook/infolib/MixedGen.C b/cde/programs/dtdocbook/infolib/MixedGen.C
index 332e460fe..ec4a7ebdd 100644
--- a/cde/programs/dtdocbook/infolib/MixedGen.C
+++ b/cde/programs/dtdocbook/infolib/MixedGen.C
@@ -735,7 +735,7 @@ writeGraphics(BookCaseDB &db, const char *thisBook, DBCursor &gr_cursor,
   const char *version;
   const char *typeInfo;
   const char *data;
-  int len;
+  size_t len;
   const char *title;
   
   while(gr_cursor.next(STRING_CODE, &aBook,
@@ -765,7 +765,7 @@ writeGraphics(BookCaseDB &db, const char *thisBook, DBCursor &gr_cursor,
 		  STRING_CODE, name,
 		  STRING_CODE, version,
 		  STRING_CODE, typeInfo,
-		  -COMPRESSED_STRING_CODE, comp_agent, data, (size_t)len,
+		  -COMPRESSED_STRING_CODE, comp_agent, data, len,
 		  STRING_CODE, title,
 		  NULL);
     }
@@ -774,7 +774,7 @@ writeGraphics(BookCaseDB &db, const char *thisBook, DBCursor &gr_cursor,
 		  STRING_CODE, name,
 		  STRING_CODE, version,
 		  STRING_CODE, typeInfo,
-		  -STRING_CODE, data, (size_t)len,
+		  -STRING_CODE, data, len,
 		  STRING_CODE, title,
 		  NULL);
     }