Index: ext/fts5/fts5_index.c
==================================================================
--- ext/fts5/fts5_index.c
+++ ext/fts5/fts5_index.c
@@ -2310,11 +2310,10 @@
   int flags,                      /* Mask of FTS5INDEX_XXX flags */
   Fts5StructureSegment *pSeg,     /* Description of segment */
   Fts5SegIter *pIter              /* Object to populate */
 ){
   int iPg = 1;
-  int h;
   int bGe = (flags & FTS5INDEX_QUERY_SCAN);
   int bDlidx = 0;                 /* True if there is a doclist-index */
 
   static int nCall = 0;
   nCall++;
@@ -2337,11 +2336,11 @@
   if( p->rc ) return;
   sqlite3_bind_int(p->pIdxSelect, 1, pSeg->iSegid);
   sqlite3_bind_blob(p->pIdxSelect, 2, pTerm, nTerm, SQLITE_STATIC);
   if( SQLITE_ROW==sqlite3_step(p->pIdxSelect) ){
     i64 val = sqlite3_column_int(p->pIdxSelect, 0);
-    iPg = (val>>1);
+    iPg = (int)(val>>1);
     bDlidx = (val & 0x0001);
   }
   p->rc = sqlite3_reset(p->pIdxSelect);
 
   if( iPg<pSeg->pgnoFirst ){
@@ -5074,11 +5073,10 @@
   /* Iterate through the b-tree hierarchy.  */
   while( p->rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pStmt) ){
     i64 iRow;                     /* Rowid for this leaf */
     Fts5Data *pLeaf;              /* Data for this leaf */
     int iOff;                     /* Offset of first term on leaf */
-    int i;                        /* Used to iterate through empty leaves */
 
     int nIdxTerm = sqlite3_column_bytes(pStmt, 1);
     const char *zIdxTerm = (const char*)sqlite3_column_text(pStmt, 1);
     int iIdxLeaf = sqlite3_column_int(pStmt, 2);
     int bIdxDlidx = sqlite3_column_int(pStmt, 3);
@@ -5126,11 +5124,11 @@
     /* If there is a doclist-index, check that it looks right. */
     if( bIdxDlidx ){
       Fts5DlidxIter *pDlidx = 0;  /* For iterating through doclist index */
       int iPrevLeaf = iIdxLeaf;
       int iSegid = pSeg->iSegid;
-      int iPg;
+      int iPg = 0;
       i64 iKey;
 
       for(pDlidx=fts5DlidxIterInit(p, 0, iSegid, iIdxLeaf);
           fts5DlidxIterEof(p, pDlidx)==0;
           fts5DlidxIterNext(p, pDlidx)

Index: ext/fts5/fts5_tcl.c
==================================================================
--- ext/fts5/fts5_tcl.c
+++ ext/fts5/fts5_tcl.c
@@ -21,10 +21,11 @@
 #include "fts5.h"
 #include <string.h>
 #include <assert.h>
 
 extern int sqlite3_fts5_may_be_corrupt;
+extern int sqlite3Fts5TestRegisterMatchinfo(sqlite3 *);
 
 /*************************************************************************
 ** This is a copy of the first part of the SqliteDb structure in 
 ** tclsqlite.c.  We need it here so that the get_sqlite_pointer routine
 ** can extract the sqlite3* pointer from an existing Tcl SQLite

Index: ext/fts5/fts5_test_mi.c
==================================================================
--- ext/fts5/fts5_test_mi.c
+++ ext/fts5/fts5_test_mi.c
@@ -257,11 +257,11 @@
       rc = pApi->xInstCount(pFts, &nInst);
       for(i=0; rc==SQLITE_OK && i<nInst; i++){
         int iPhrase, iOff, iCol = 0;
         int iNextPhrase;
         int iNextOff;
-        int nSeq = 1;
+        u32 nSeq = 1;
         int j;
 
         rc = pApi->xInst(pFts, i, &iPhrase, &iCol, &iOff);
         iNextPhrase = iPhrase+1;
         iNextOff = iOff+pApi->xPhraseSize(pFts, 0);