diff --git a/src/core/displayencoder.cpp b/src/core/displayencoder.cpp
index 3b3536d..0bca15c 100644
--- a/src/core/displayencoder.cpp
+++ b/src/core/displayencoder.cpp
@@ -568,7 +568,7 @@ TCHAR cCharEncoderUtil::hex_to_char( TSTRING::const_iterator first,
     
     if( ss.bad() || ss.fail() )
         ThrowAndAssert( eBadHexConversion( TSTRING( first, last ) ) );
-    if( (TCHAR)ch > max_char || (TCHAR)ch < min_char )
+    if( ch > (unsigned long)max_char || ch < (unsigned long)min_char )
         ThrowAndAssert( eBadHexConversion( TSTRING( first, last ) ) );
 
     return (TCHAR)ch;
diff --git a/src/core/ntmbs.cpp b/src/core/ntmbs.cpp
index 97202cf..beaf31c 100644
--- a/src/core/ntmbs.cpp
+++ b/src/core/ntmbs.cpp
@@ -96,7 +96,7 @@ tss::mbsdec( const_ntmbs_t beg, const_ntmbs_t curr )
     const_ntmbs_t prev = curr - 1;
     for ( ; prev > beg && ::mblen( (char*)prev, curr - prev ) == -1; --prev );
 
-    if ( curr - prev > MB_CUR_MAX )
+    if ( (size_t)(curr - prev) > MB_CUR_MAX )
     {
         prev = (curr - 1);
 
diff --git a/src/tw/twstrings.cpp b/src/tw/twstrings.cpp
index 262576b..da4637b 100644
--- a/src/tw/twstrings.cpp
+++ b/src/tw/twstrings.cpp
@@ -243,8 +243,8 @@ TSS_BeginStringtable( cTW )
   TSS_StringEntry( tw::STR_COPYRIGHT,           TSS_COPYRIGHT_NOTICE ),
   TSS_StringEntry( tw::STR_TSS_PRODUCT_NAME,    TSS_PRODUCT_NAME BUILD_NUM UNICODE_STR DEBUG_STR ),
 
-  TSS_StringEntry( tw::STR_VERSION,       TSS_PRODUCT_NAME BUILD_NUM UNICODE_STR DEBUG_STR _T(" built for "TARGET_OS"\n\n") TSS_COPYRIGHT_NOTICE  ),
-  TSS_StringEntry( tw::STR_VERSION_LONG, TSS_PRODUCT_NAME BUILD_NUM UNICODE_STR DEBUG_STR _T(" built for "TARGET_OS"\n\n") TSS_COPYRIGHT_NOTICE_LONG  ),
+  TSS_StringEntry( tw::STR_VERSION,       TSS_PRODUCT_NAME BUILD_NUM UNICODE_STR DEBUG_STR _T(" built for " TARGET_OS "\n\n") TSS_COPYRIGHT_NOTICE  ),
+  TSS_StringEntry( tw::STR_VERSION_LONG, TSS_PRODUCT_NAME BUILD_NUM UNICODE_STR DEBUG_STR _T(" built for " TARGET_OS "\n\n") TSS_COPYRIGHT_NOTICE_LONG  ),
 
 TSS_EndStringtable( cTW )
 
diff --git a/src/twadmin/keygeneration.cpp b/src/twadmin/keygeneration.cpp
index 600f3a8..b858d4e 100644
--- a/src/twadmin/keygeneration.cpp
+++ b/src/twadmin/keygeneration.cpp
@@ -158,6 +158,8 @@ bool GenerateKey(const TCHAR* keyPath, wc16_string passphrase, const cElGamalSig
         {
         case tGK::FILE_WRITE_ERROR:
             TCERR << std::endl << TSS_GetString(cTWAdmin, twadmin::STR_ERR2_KEYGEN_FILEWRITE) << gk.keyPath << std::endl;
+            break;
+
         default:
             TCERR << std::endl << TSS_GetString(cTWAdmin, twadmin::STR_ERR2_KEYGEN) << gk.keyPath 
                   << TSS_GetString(cTWAdmin, twadmin::STR_ERR2_KEYGEN2) << std::endl;