Index: src/shell.c.in
==================================================================
--- src/shell.c.in
+++ src/shell.c.in
@@ -6560,11 +6560,11 @@
   int bFreelist = 1;              /* 0 if --freelist-corrupt is specified */
   for(i=1; i<nArg; i++){
     char *z = azArg[i];
     int n;
     if( z[0]=='-' && z[1]=='-' ) z++;
-    n = strlen(z);
+    n = strlen30(z);
     if( n<=17 && memcmp("-freelist-corrupt", z, n)==0 ){
       bFreelist = 0;
     }else
     if( n<=12 && memcmp("-recovery-db", z, n)==0 && i<(nArg-1) ){
       i++;
@@ -7297,12 +7297,12 @@
       { "has_moved",      SQLITE_FCNTL_HAS_MOVED,       ""               },  
       { "lock_timeout",   SQLITE_FCNTL_LOCK_TIMEOUT,    "MILLISEC"       },
     };
     int filectrl = -1;
     int iCtrl = -1;
-    sqlite3_int64 iRes;  /* Integer result to display if rc2==1 */
-    int isOk = 0;        /* 0: usage  1: %lld  2: no-result */
+    sqlite3_int64 iRes = 0;  /* Integer result to display if rc2==1 */
+    int isOk = 0;            /* 0: usage  1: %lld  2: no-result */
     int n2, i;
     const char *zCmd = 0;
 
     open_db(p, 0);
     zCmd = nArg>=2 ? azArg[1] : "help";

Index: test/altertab3.test
==================================================================
--- test/altertab3.test
+++ test/altertab3.test
@@ -202,10 +202,11 @@
 do_test 8.2.3 {
   sqlite3 db2 test.db
   db2 eval { INSERT INTO t2 VALUES (1), (2), (3) }
   db close
 } {}
+db2 close
 
 #-------------------------------------------------------------------------
 reset_db
 do_execsql_test 9.1 {
   CREATE TABLE t1(a,b,c);
@@ -218,7 +219,5 @@
   ALTER TABLE t1 RENAME TO t1x;
 }
 
 
 finish_test
-
-