diff --git a/src/drw_header.cpp b/src/drw_header.cpp
index 0081725..8b8d65f 100644
--- a/src/drw_header.cpp
+++ b/src/drw_header.cpp
@@ -2400,9 +2400,8 @@ bool DRW_Header::parseDwg(DRW::Version version, dwgBuffer *buf, dwgBuffer *hBbuf
     }
 
     //temporary code to show header end sentinel
-    duint64 sz= buf->size()-1;
     if (version < DRW::AC1018) {//pre 2004
-        sz= buf->size()-16;
+        const duint64 sz= buf->size()-16;
         buf->setPosition(sz);
         DRW_DBG("\nseting position to: "); DRW_DBG(buf->getPosition());
         DRW_DBG("\ndwg header end sentinel= ");
@@ -2419,7 +2418,7 @@ bool DRW_Header::parseDwg(DRW::Version version, dwgBuffer *buf, dwgBuffer *hBbuf
             DRW_DBGH(buf->getRawChar8()); DRW_DBG(" ");
         }
     } else if (version == DRW::AC1021) {//2007
-        sz= buf->size()-16;
+        const duint64 sz= buf->size()-16;
         buf->setPosition(sz);
         DRW_DBG("\nseting position to: "); DRW_DBG(buf->getPosition());
         DRW_DBG("\ndwg header end sentinel= ");
diff --git a/src/intern/dwgreader.cpp b/src/intern/dwgreader.cpp
index 05aa819..73c0e9c 100644
--- a/src/intern/dwgreader.cpp
+++ b/src/intern/dwgreader.cpp
@@ -710,6 +710,7 @@ bool dwgReader::readDwgTables(DRW_Header& hdr, dwgBuffer *dbuf) {
                         ret = false;
                     } else { //reset position
                     buff.resetPosition();
+                    (void)bs;
 /* RLZ: writeme                   ret2 = vpEntHeader.parseDwg(version, &buff, bs);
                     if(ret)
                         ret = ret2;*/
diff --git a/src/intern/dwgreader.h b/src/intern/dwgreader.h
index 91aebc9..2d62b6f 100644
--- a/src/intern/dwgreader.h
+++ b/src/intern/dwgreader.h
@@ -60,13 +60,13 @@ class dwgPageInfo {
     dwgPageInfo(duint64 i, duint64 ad, duint32 sz){
         Id=i; address=ad; size=sz;
     }
-    duint64 Id;
-    duint64 address; //in file stream, for rd18, rd21
-    duint64 size; //in file stream, for rd18, rd21
-    duint64 dataSize; //for rd18, rd21
-    duint32 startOffset; //for rd18, rd21
-    duint64 cSize; //compresed page size, for rd21
-    duint64 uSize; //uncompresed page size, for rd21
+    duint64 Id{0};
+    duint64 address{0}; //in file stream, for rd18, rd21
+    duint64 size{0}; //in file stream, for rd18, rd21
+    duint64 dataSize{0}; //for rd18, rd21
+    duint32 startOffset{0}; //for rd18, rd21
+    duint64 cSize{0}; //compressed page size, for rd21
+    duint64 uSize{0}; //uncompressed page size, for rd21
 };
 
 // sections of file