Index: Makefile.msc
==================================================================
--- Makefile.msc
+++ Makefile.msc
@@ -1012,11 +1012,13 @@
   $(TOP)\ext\icu\sqliteicu.h \
   $(TOP)\ext\icu\icu.c \
   $(TOP)\ext\rtree\rtree.h \
   $(TOP)\ext\rtree\rtree.c \
   $(TOP)\ext\session\sqlite3session.h \
-  $(TOP)\ext\session\sqlite3session.c
+  $(TOP)\ext\session\sqlite3session.c \
+  $(TOP)\ext\ota\sqlite3ota.h \
+  $(TOP)\ext\ota\sqlite3ota.c
 
 
 # Generated source code files
 #
 SRC5 = \
@@ -1073,11 +1075,12 @@
   $(TOP)\src\test_thread.c \
   $(TOP)\src\test_vfs.c \
   $(TOP)\src\test_wsd.c \
   $(TOP)\ext\fts3\fts3_term.c \
   $(TOP)\ext\fts3\fts3_test.c \
-  $(TOP)\ext\session\test_session.c
+  $(TOP)\ext\session\test_session.c \
+  $(TOP)\ext\ota\test_ota.c
 
 # Statically linked extensions
 #
 TESTEXT = \
   $(TOP)\ext\misc\amatch.c \

Index: ext/fts3/fts3_snippet.c
==================================================================
--- ext/fts3/fts3_snippet.c
+++ ext/fts3/fts3_snippet.c
@@ -129,11 +129,11 @@
 ** Allocate a two-slot MatchinfoBuffer object.
 */
 static MatchinfoBuffer *fts3MIBufferNew(int nElem, const char *zMatchinfo){
   MatchinfoBuffer *pRet;
   int nByte = sizeof(u32) * (2*nElem + 2) + sizeof(MatchinfoBuffer);
-  int nStr = strlen(zMatchinfo);
+  int nStr = (int)strlen(zMatchinfo);
 
   pRet = sqlite3_malloc(nByte + nStr+1);
   if( pRet ){
     memset(pRet, 0, nByte);
     pRet->aMatchinfo[0] = (u8*)(&pRet->aMatchinfo[1]) - (u8*)pRet;

Index: ext/session/sqlite3session.c
==================================================================
--- ext/session/sqlite3session.c
+++ ext/session/sqlite3session.c
@@ -1490,11 +1490,11 @@
             if( abPK[i] ) bHasPk = 1;
           }
         }
 
       }
-      sqlite3_free(azCol);
+      sqlite3_free((char*)azCol);
       if( bMismatch ){
         *pzErrMsg = sqlite3_mprintf("table schemas do not match");
         rc = SQLITE_SCHEMA;
       }
       if( bHasPk==0 ){