diff --git a/src/core/debug.cpp b/src/core/debug.cpp
index 8c2949f..2e14caa 100644
--- a/src/core/debug.cpp
+++ b/src/core/debug.cpp
@@ -45,7 +45,7 @@
 #include <cstdio>
 
 int           cDebug::mDebugLevel(10);
-uint32        cDebug::mOutMask(cDebug::OUT_TRACE);
+uint32_t      cDebug::mOutMask(cDebug::OUT_TRACE);
 std::ofstream cDebug::logfile;
 //mDebugLevel default == 10, mOutMask default == OUT_TRACE.
 
diff --git a/src/core/debug.h b/src/core/debug.h
index c0ebb2e..7953459 100644
--- a/src/core/debug.h
+++ b/src/core/debug.h
@@ -147,7 +147,7 @@ private:
     };
 
     static int           mDebugLevel;
-    static uint32        mOutMask;
+    static uint32_t      mOutMask;
     static std::ofstream logfile;
     char                 mLabel[MAX_LABEL];
 
diff --git a/src/core/errorbucketimpl.cpp b/src/core/errorbucketimpl.cpp
index 2a9cf12..9a7e01c 100644
--- a/src/core/errorbucketimpl.cpp
+++ b/src/core/errorbucketimpl.cpp
@@ -103,7 +103,7 @@ void cErrorReporter::PrintErrorMsg(const eError& error, const TSTRING& strExtra)
             errStr.erase(firstLF);
         }
 
-        ASSERT(errStr.length() + len + 6 < 80); // line too big for terminal?
+        ASSERT(errStr.length() + 6 < 80); // line too big for terminal?
                                                 // Add 6 to account for "### ' and ': '
         TCERR << TSS_GetString(cCore, core::STR_ERROR_COLON) << _T(" ") << errStr;
         TCERR << std::endl;
diff --git a/src/core/serializerimpl.cpp b/src/core/serializerimpl.cpp
index 069e3b7..a31280f 100644
--- a/src/core/serializerimpl.cpp
+++ b/src/core/serializerimpl.cpp
@@ -62,7 +62,7 @@ static uint32_t util_GetCRC(const cType& type)
     const uint8_t* pszType = (const uint8_t*)(type.AsString());
     int            nBytes  = ::strlen((const char*)pszType);
 
-    ASSERT(sizeof(uint8_t) == sizeof(byte));
+    //ASSERT(sizeof(uint8_t) == sizeof(byte));
     ASSERT(pszType && *pszType);
 
     //
diff --git a/src/db/block.h b/src/db/block.h
index 14c040b..79cb411 100644
--- a/src/db/block.h
+++ b/src/db/block.h
@@ -184,8 +184,8 @@ template<int SIZE> inline cBlockImpl<SIZE>::cBlockImpl() : cBlock<SIZE>(), mTime
 ///////////////////////////////////////////////////////////////////////////////
 template<int SIZE> inline void cBlockImpl<SIZE>::Write(cBidirArchive& arch) //throw( eArchive )
 {
-    ASSERT(mbDirty);
-    ASSERT((mBlockNum >= 0) && (((mBlockNum + 1) * SIZE) <= arch.Length()));
+    ASSERT(cBlock<SIZE>::mbDirty);
+    ASSERT((cBlock<SIZE>::mBlockNum >= 0) && (((cBlock<SIZE>::mBlockNum + 1) * SIZE) <= arch.Length()));
 
     arch.Seek((cBlock<SIZE>::mBlockNum * SIZE), cBidirArchive::BEGINNING);
     arch.WriteBlob(cBlock<SIZE>::mpData, SIZE);
@@ -201,7 +201,7 @@ template<int SIZE> inline void cBlockImpl<SIZE>::Read(cBidirArchive& arch, int b
     if (blockNum != INVALID_NUM)
         cBlock<SIZE>::mBlockNum = blockNum;
 
-    ASSERT((mBlockNum >= 0) && (((mBlockNum + 1) * SIZE) <= arch.Length()));
+    ASSERT((cBlock<SIZE>::mBlockNum >= 0) && (((cBlock<SIZE>::mBlockNum + 1) * SIZE) <= arch.Length()));
 
     //    std::cout << "cBlockImpl<SIZE>::Read() mBlockNum = " << mBlockNum << " arch.Length() = " << arch.Length() << std::endl;
 
diff --git a/src/tw/twinit.cpp b/src/tw/twinit.cpp
index 450a4da..058ac8f 100644
--- a/src/tw/twinit.cpp
+++ b/src/tw/twinit.cpp
@@ -211,7 +211,7 @@ void cTWInit::Init(const TSTRING& strArgv0)
                          // should call this function (cTWInit::Init) on startup
 
     // we require 8-bit bytes for some functionality
-    ASSERT(sizeof(byte) == sizeof(uint8_t));
+    //ASSERT(sizeof(byte) == sizeof(uint8_t));
 
     //
     // set debug level