diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c
index 8196e351bc..2f80af5644 100644
--- a/ext/rtree/rtree.c
+++ b/ext/rtree/rtree.c
@@ -3222,6 +3222,7 @@ static int rtreeRename(sqlite3_vtab *pVtab, const char *zNewName){
 static int rtreeSavepoint(sqlite3_vtab *pVtab, int iSavepoint){
   Rtree *pRtree = (Rtree *)pVtab;
   int iwt = pRtree->inWrTrans;
+  UNUSED_PARAMETER(iSavepoint);
   pRtree->inWrTrans = 0;
   nodeBlobReset(pRtree);
   pRtree->inWrTrans = iwt;
diff --git a/manifest b/manifest
index 9a474a3732..40eed6a73a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\scollision\sof\sthe\s"B0"\sidentifier\sname\sbetween\sthe\stermios.h\sheader\nfile\sand\sthe\sSHA3\simplementation\sin\sthe\sshell.
-D 2017-05-04T11:13:50.417
+C Fix\srequirements\smarks\sand\sharmless\scompiler\swarnings.
+D 2017-05-06T17:12:52.313
 F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 6a8c838220f7c00820e1fc0ac1bccaaa8e5676067e1dbfa1bafa7a4ffecf8ae6
@@ -272,7 +272,7 @@ F ext/rbu/sqlite3rbu.c 2a89efba9eeba8e6c89a498dc195e8efbdde2694
 F ext/rbu/sqlite3rbu.h 6fb6294c34a9ca93b5894a33bca530c6f08decba
 F ext/rbu/test_rbu.c 5aa22616afac6f71ebd3d9bc9bf1006cfabcca88
 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
-F ext/rtree/rtree.c 37c603c6b8aed1a760661ceb5a025bd36bac14cf56d59949bd8de14b2a17e9ed
+F ext/rtree/rtree.c 8205d6e4466f766e57ce1b8aa38224ac9e1cec2d2bf4684cd1cc5a6ddf9b7014
 F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
 F ext/rtree/rtree1.test d5f0ba215b3bd1d05269ada86e74073b8445852aa0d33a63e10ec63a09c39473
 F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@@ -403,7 +403,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 3e518b962d932a997fae373366880fc028c75706
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c 4f0adefaa5e9417459b07757e0f6060cac97930a86f0fba9797bab233ced66c0
-F src/shell.c e5950029da103c5d378e71d548759459b9a7fc76177a71562c22082c705745ab
+F src/shell.c a37d96b20b3644d0eb905df5aa7a0fcf9f6e73c15898337230c760a24a8df794
 F src/sqlite.h.in eeb1da70a61d52e1d58e5b55446b85bbac571699421d3cf857421c56214013ce
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 58fd0676d3111d02e62e5a35992a7d3da5d3f88753acc174f2d37b774fbbdd28
@@ -709,7 +709,7 @@ F test/fkey1.test ba64806ff9a04eecab2679caad377ae99a5e94e4
 F test/fkey2.test 155809016fad6b2a1491facf2ac53a551bc57c2c
 F test/fkey3.test 76d475c80b84ee7a5d062e56ccb6ea68882e2b49
 F test/fkey4.test 86446017011273aad8f9a99c1a65019e7bd9ca9d
-F test/fkey5.test 19a9b73bafd78323c37fc883dba060191541503d6094f8aea67fe94d33118e20
+F test/fkey5.test 24dd28eb3d9f1b5a174f47e9899ace5facb08373a4223593c8c631e6cf9f7d5a
 F test/fkey6.test d078a1e323a740062bed38df32b8a736fd320dc0
 F test/fkey7.test 72e915890ee4a005daaf3002cb208e8fe973ac13
 F test/fkey8.test e5372e32cdb4481f121ec3550703eeb7b4e0762c
@@ -1578,7 +1578,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P e24b73820cdca07eee87853fe6dd9f60d76e039eeb4aebef03654db3c7c94f14
-R e8b739e45c08ec8468647ac109d9456f
+P b9a58daca80a815e87e541cb5fff9bc8b93f131d223f322c5b83dd5a5f0c0312
+R 7439e7b02aa88b692e04c05c6e92f9d2
 U drh
-Z 82e99d9ee4b60fac8b8163f812301e67
+Z 9b526b1df399cb1577efc1cd64d02ba1
diff --git a/manifest.uuid b/manifest.uuid
index c0dd2c30e8..ab929d53dd 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b9a58daca80a815e87e541cb5fff9bc8b93f131d223f322c5b83dd5a5f0c0312
\ No newline at end of file
+198ff4c01d86d193a54745764d69376cab8e94747a4daa444690f7e1ec87800b
\ No newline at end of file
diff --git a/src/shell.c b/src/shell.c
index 582d6f3142..d36f1fdd19 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -438,7 +438,7 @@ static void utf8_width_print(FILE *pOut, int w, const char *zUtf){
   int n;
   int aw = w<0 ? -w : w;
   char zBuf[1000];
-  if( aw>sizeof(zBuf)/3 ) aw = sizeof(zBuf)/3;
+  if( aw>(int)sizeof(zBuf)/3 ) aw = (int)sizeof(zBuf)/3;
   for(i=n=0; zUtf[i]; i++){
     if( (zUtf[i]&0xc0)!=0x80 ){
       n++;
diff --git a/test/fkey5.test b/test/fkey5.test
index e9bb47f895..3c44cd319f 100644
--- a/test/fkey5.test
+++ b/test/fkey5.test
@@ -115,8 +115,11 @@ do_test fkey5-1.6 {
 # EVIDENCE-OF: R-55672-01620 The first column is the name of the table
 # that contains the REFERENCES clause.
 #
-# EVIDENCE-OF: R-25219-25618 The second column is the rowid of the row
-# that contains the invalid REFERENCES clause.
+# EVIDENCE-OF: R-00471-55166 The second column is the rowid of the row
+# that contains the invalid REFERENCES clause, or NULL if the child
+# table is a WITHOUT ROWID table.
+#
+# The second clause in the previous is tested by fkey5-10.3.
 #
 # EVIDENCE-OF: R-40482-20265 The third column is the name of the table
 # that is referred to.
@@ -407,6 +410,9 @@ do_execsql_test 10.1 {
 do_execsql_test 10.2 {
   PRAGMA foreign_key_check;
 }
+# EVIDENCE-OF: R-00471-55166 The second column is the rowid of the row
+# that contains the invalid REFERENCES clause, or NULL if the child
+# table is a WITHOUT ROWID table.
 do_execsql_test 10.3 {
   INSERT INTO c30 VALUES(45, 45);
   PRAGMA foreign_key_check;