Index: src/json.c
==================================================================
--- src/json.c
+++ src/json.c
@@ -1665,12 +1665,13 @@
   g.json.resultCode = code;
   if(!fmt || !*fmt){
     g.zErrMsg = mprintf("%s", json_err_cstr(code));
   }else{
     va_list vargs;
+	char * msg;
     va_start(vargs,fmt);
-    char * msg = vmprintf(fmt, vargs);
+    msg = vmprintf(fmt, vargs);
     va_end(vargs);
     g.zErrMsg = msg;
   }
   return code;
 }
@@ -2316,11 +2317,12 @@
   json_send_response(payload);
   cson_value_free(payload);
   return rc;
 }
 
-#ifdef FOSSIL_ENABLE_JSON /* dupe ifdef needed for mkindex */
+#ifdef FOSSIL_ENABLE_JSON
+/* dupe ifdef needed for mkindex */
 /*
 ** WEBPAGE: json
 **
 ** Pages under /json/... must be entered into JsonPageDefs.
 ** This function dispatches them, and is the HTTP equivalent of
@@ -2339,11 +2341,12 @@
   }
   json_dispatch_root_command( zCommand );
 }
 #endif /* FOSSIL_ENABLE_JSON for mkindex */
 
-#ifdef FOSSIL_ENABLE_JSON /* dupe ifdef needed for mkindex */
+#ifdef FOSSIL_ENABLE_JSON
+/* dupe ifdef needed for mkindex */
 /*
 ** This function dispatches json commands and is the CLI equivalent of
 ** json_page_top().
 **
 ** COMMAND: json

Index: src/json_tag.c
==================================================================
--- src/json_tag.c
+++ src/json_tag.c
@@ -113,12 +113,13 @@
                   : cson_value_null());
   cson_object_set(pay, "propagate", cson_value_new_bool(fPropagate));
   cson_object_set(pay, "raw", cson_value_new_bool(fRaw));
   {
     Blob uu = empty_blob;
+	int rc;
     blob_append(&uu, zName, -1);
-    int const rc = name_to_uuid(&uu, 9, "*");
+    rc = name_to_uuid(&uu, 9, "*");
     if(0!=rc){
       json_set_err(FSL_JSON_E_UNKNOWN,"Could not convert name back to UUID!");
       blob_reset(&uu);
       goto error;
     }

Index: src/json_wiki.c
==================================================================
--- src/json_wiki.c
+++ src/json_wiki.c
@@ -107,13 +107,13 @@
     if(0 == contentFormat){
       cson_object_set(pay,"size",
                       json_new_int((cson_int_t)(zBody?strlen(zBody):0)));
     }else{
       if( contentFormat>0 ){/*HTML-ize it*/
-        zFormat = "html";
         Blob content = empty_blob;
         Blob raw = empty_blob;
+		zFormat = "html";
         if(zBody && *zBody){
           blob_append(&raw,zBody,-1);
           wiki_convert(&raw,&content,0);
           len = (unsigned int)blob_size(&content);
         }