diff --git a/libdispatch/nc_url.c b/libdispatch/nc_url.c
index 666ca3cef..4d9fe7565 100644
--- a/libdispatch/nc_url.c
+++ b/libdispatch/nc_url.c
@@ -323,9 +323,10 @@ nc_urlparamfree(NClist* params)
     int i,j;
     if(params == NULL) return;
     for(i=0;i<nclistlength(params);i+=2) {
+	NClist* values;
 	char* s = (char*)nclistget(params,i);
 	if(s != NULL) free((void*)s);
-	NClist* values = (NClist*)nclistget(params,i+1);
+	values = (NClist*)nclistget(params,i+1);
 	for(j=0;j<nclistlength(values);j++) {
 	    s = (char*)nclistget(values,j);	    
 	    if(s != NULL) free((void*)s);
diff --git a/libncdap3/ce.y b/libncdap3/ce.y
index 4fbdfc44d..6d920b59c 100644
--- a/libncdap3/ce.y
+++ b/libncdap3/ce.y
@@ -43,7 +43,7 @@ selections:
 	;
 
 /* %type NClist<NCprojection*> */
-projectionlist: //==expr.projection
+projectionlist: /*==expr.projection*/
 	  projection
 	    {$$=projectionlist(parsestate,(Object)null,$1);}
 	| projectionlist ',' projection
@@ -51,7 +51,7 @@ projectionlist: //==expr.projection
 	;
 
 /* %type NCprojection* */
-projection: //==expr.proj_clause
+projection: /*==expr.proj_clause*/
 	  segmentlist
 	    {$$=projection(parsestate,$1);}
 	| function
@@ -66,7 +66,7 @@ function:
 	;
 
 /* %type NClist<OCsegment> */
-segmentlist: //==expr.proj_variable
+segmentlist: /*==expr.proj_variable*/
 	  segment
 	    {$$=segmentlist(parsestate,null,$1);}
 	| segmentlist '.' segment
@@ -74,7 +74,7 @@ segmentlist: //==expr.proj_variable
 	;
 
 /* %type OCsegment */
-segment: //==expr.component
+segment: /*==expr.component*/
 	  word
 	    {$$=segment(parsestate,$1,null);}
 	| word rangelist
@@ -105,7 +105,7 @@ range1: '[' number ']'
 
 
 /* %type NClist<NCselection*> */
-clauselist: //==expr.selection
+clauselist: /*==expr.selection*/
 	  sel_clause
 	    {$$=clauselist(parsestate,null,$1);}
 	| clauselist sel_clause
@@ -113,7 +113,7 @@ clauselist: //==expr.selection
 	;
 
 /* %type NCselection* */
-sel_clause: //==expr.clause
+sel_clause: /*==expr.clause*/
 	  '&' value rel_op '{' value_list '}'
 	    {$$=sel_clause(parsestate,1,$2,$3,$5);} /*1,2 distinguish cases*/
 	| '&' value rel_op value
@@ -183,7 +183,7 @@ boolfunction:
 	    {$$=function(parsestate,$1,$3);}
 	;
 
-arg_list: //==expr.arg_list
+arg_list: /*==expr.arg_list*/
 	  value
 	    {$$=arg_list(parsestate,null,$1);}
 	| value_list ',' value
diff --git a/libncdap3/ceparse.c b/libncdap3/ceparse.c
index 4e4749205..dfde28c18 100644
--- a/libncdap3/ceparse.c
+++ b/libncdap3/ceparse.c
@@ -67,7 +67,7 @@ fprintf(stderr,"	ce.projection: %s\n",
 Object
 segmentlist(CEparsestate* state, Object var0, Object decl)
 {
-    // watch out: this is non-standard
+    /* watch out: this is non-standard */
     NClist* list;
     NCvar* v = (NCvar*)var0;
     if(v==NULL) v = createncvar();
@@ -168,7 +168,7 @@ sel_clause(CEparsestate* state, int selcase,
     NCselection* sel = createncselection();
     sel->operator = (NCsort)relop0;
     sel->lhs = (NCvalue*)lhs;
-    if(selcase == 2) {//singleton value
+    if(selcase == 2) {/*singleton value*/
 	sel->rhs = nclistnew();
 	nclistpush(sel->rhs,(ncelem)values);
     } else
@@ -185,6 +185,7 @@ indexpath(CEparsestate* state, Object list0, Object index)
 Object
 array_indices(CEparsestate* state, Object list0, Object indexno)
 {
+    NCslice* slice;
     long long start = -1;
     NClist* list = (NClist*)list0;
     if(list == NULL) list = nclistnew();
@@ -193,7 +194,7 @@ array_indices(CEparsestate* state, Object list0, Object indexno)
     	ceerror(state,"Illegal array index");
 	start = 1;
     }    
-    NCslice* slice = createncslice();
+    slice = createncslice();
     slice->first = start;
     slice->stride = 1;
     slice->count = 1;
diff --git a/ncgen/ncgen.y b/ncgen/ncgen.y
index 625d6f8e6..4ae5826a4 100644
--- a/ncgen/ncgen.y
+++ b/ncgen/ncgen.y
@@ -1200,12 +1200,12 @@ makespecial(int tag, Symbol* vsym, Symbol* tsym, void* data, int isconst)
     
     if(vsym != NULL) special = &vsym->var.special;
     if(tag == _FORMAT_FLAG) {
-	if(kflag_flag == 0) goto done;
-	/* Only use this tag if kflag is not set */
-	/* Use the table in main.c */
 	struct Kvalues* kvalue;
 	int found = 0;
         int modifier = 0;
+	if(kflag_flag == 0) goto done;
+	/* Only use this tag if kflag is not set */
+	/* Use the table in main.c */
         for(kvalue=legalkinds;kvalue->name;kvalue++) {
 	    if(strcmp(sdata,kvalue->name) == 0) {
 		modifier = kvalue->mode;
diff --git a/oc/curlfunctions.c b/oc/curlfunctions.c
index 5c2eddf32..c10a9b64c 100644
--- a/oc/curlfunctions.c
+++ b/oc/curlfunctions.c
@@ -118,7 +118,7 @@ ocset_ssl(CURL* curl, OCstate* state)
 	    DEBUG1(1,"CURLOPT_SSLKEY=%s",ssl->key);
         }
         if(ssl->keypasswd) {
-            // libcurl prior to 7.16.4 used 'CURLOPT_SSLKEYPASSWD'
+            /* libcurl prior to 7.16.4 used 'CURLOPT_SSLKEYPASSWD' */
             cstat = curl_easy_setopt(curl, CURLOPT_KEYPASSWD, ssl->keypasswd);
             if(cstat != CURLE_OK) goto fail;
 	    DEBUG1(1,"CURLOPT_SSLKEY=%s",ssl->key);