Index: src/pragma.c
==================================================================
--- src/pragma.c
+++ src/pragma.c
@@ -2000,10 +2000,15 @@
   sqlite3StrAccumAppendAll(&acc, "CREATE TABLE x");
   for(i=0, j=pPragma->iPragCName; i<pPragma->nPragCName; i++, j++){
     sqlite3XPrintf(&acc, "%c\"%s\"", cSep, pragCName[j]);
     cSep = ',';
   }
+  if( i==0 ){
+    sqlite3XPrintf(&acc, "(\"%s\"", pPragma->zName);
+    cSep = ',';
+    i++;
+  }
   j = 0;
   if( pPragma->mPragFlg & PragFlg_Result1 ){
     sqlite3StrAccumAppendAll(&acc, ",arg HIDDEN");
     j++;
   }
@@ -2065,11 +2070,10 @@
     if( pConstraint->usable==0 ) continue;
     if( pConstraint->op!=SQLITE_INDEX_CONSTRAINT_EQ ) continue;
     if( pConstraint->iColumn < pTab->iHidden ) continue;
     j = pConstraint->iColumn - pTab->iHidden;
     assert( j < 2 );
-    if( seen[j] ) continue;
     seen[j] = i+1;
   }
   if( seen[0]==0 ){
     pIdxInfo->estimatedCost = (double)2147483647;
     pIdxInfo->estimatedRows = 2147483647;
@@ -2111,10 +2115,11 @@
 
 /* Close a pragma virtual table cursor */
 static int pragmaVtabClose(sqlite3_vtab_cursor *cur){
   PragmaVtabCursor *pCsr = (PragmaVtabCursor*)cur;
   pragmaVtabCursorClear(pCsr);
+  sqlite3_free(pCsr);
   return SQLITE_OK;
 }
 
 /* Advance the pragma virtual table cursor to the next row */
 static int pragmaVtabNext(sqlite3_vtab_cursor *pVtabCursor){
@@ -2121,16 +2126,15 @@
   PragmaVtabCursor *pCsr = (PragmaVtabCursor*)pVtabCursor;
   int rc = SQLITE_OK;
 
   /* Increment the xRowid value */
   pCsr->iRowid++;
-  if( pCsr->pPragma ){
-    if( SQLITE_ROW!=sqlite3_step(pCsr->pPragma) ){
-      rc = sqlite3_finalize(pCsr->pPragma);
-      pCsr->pPragma = 0;
-      pragmaVtabCursorClear(pCsr);
-    }
+  assert( pCsr->pPragma );
+  if( SQLITE_ROW!=sqlite3_step(pCsr->pPragma) ){
+    rc = sqlite3_finalize(pCsr->pPragma);
+    pCsr->pPragma = 0;
+    pragmaVtabCursorClear(pCsr);
   }
   return rc;
 }
 
 /* 

Index: src/vtab.c
==================================================================
--- src/vtab.c
+++ src/vtab.c
@@ -55,10 +55,11 @@
     pDel = (Module *)sqlite3HashInsert(&db->aModule,zCopy,(void*)pMod);
     assert( pDel==0 || pDel==pMod );
     if( pDel ){
       sqlite3OomFault(db);
       sqlite3DbFree(db, pDel);
+      pMod = 0;
     }
   }
   return pMod;
 }