diff --git a/src/aclocal.m4 b/src/aclocal.m4
index bb42eb49f..8a8d2dcad 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -351,7 +351,7 @@ case "${host_os}" in
                 BUNDLE_LDFLAGS="-dy -G ${LDFLAGS}"
                 ECL_LDRPATH='-Wl,-R,~A'
                 TCPLIBS='-lsocket -lnsl -lintl'
-                clibs='${clibs} -ldl'
+                clibs="${clibs} -ldl"
                 SONAME="${SHAREDPREFIX}ecl.${SHAREDEXT}.SOVERSION"
                 SONAME_LDFLAGS="-Wl,-soname,SONAME"
                 if test "x$GCC" = "xyes"; then
diff --git a/src/c/array.d b/src/c/array.d
index ca08ccddd..d945e369d 100644
--- a/src/c/array.d
+++ b/src/c/array.d
@@ -550,7 +550,6 @@ ecl_array_allocself(cl_object x)
   }
 #endif
   case ecl_aet_bc: {
-    cl_index elt_size = 1;
     x->vector.self.bc = (ecl_base_char *)ecl_alloc_atomic(d+1);
     /* Null terminate the string */
     x->vector.self.bc[d] = 0;
@@ -752,7 +751,7 @@ cl_array_element_type(cl_object a)
 void
 ecl_displace(cl_object from, cl_object to, cl_object offset)
 {
-  cl_index j;
+  cl_fixnum j;
   void *base;
   cl_elttype totype, fromtype;
   fromtype = from->array.elttype;
diff --git a/src/c/cfun.d b/src/c/cfun.d
index 22e6d712a..98b297538 100644
--- a/src/c/cfun.d
+++ b/src/c/cfun.d
@@ -127,6 +127,7 @@ cl_function_lambda_expression(cl_object fun)
   case t_bclosure:
     lex = fun->bclosure.lex;
     fun = fun->bclosure.code;
+    // fallthrough
   case t_bytecodes:
     name = fun->bytecodes.name;
     output = fun->bytecodes.definition;
diff --git a/src/c/character.d b/src/c/character.d
index 949ca83d5..8456bdfb3 100644
--- a/src/c/character.d
+++ b/src/c/character.d
@@ -206,6 +206,7 @@ ecl_char_eq(cl_object x, cl_object y)
     c = ecl_va_arg(cs);
     for (j = 1; j<i; j++)
       if (ecl_char_eq(ecl_va_arg(ds), c)) {
+        ecl_va_end(ds);
         @(return ECL_NIL);
       }
     ecl_va_end(ds);
diff --git a/src/c/compiler.d b/src/c/compiler.d
index 9e26b6f00..b5ee4df47 100644
--- a/src/c/compiler.d
+++ b/src/c/compiler.d
@@ -2088,7 +2088,7 @@ c_tagbody(cl_env_ptr env, cl_object args, int flags)
 
 static int
 c_the(cl_env_ptr env, cl_object stmt, int flags) {
-  cl_object type = pop(&stmt);
+  pop(&stmt);
   cl_object value = pop(&stmt);
   if (stmt != ECL_NIL) {
     FEprogram_error_noreturn("THE: Too many arguments",0);
@@ -3154,7 +3154,7 @@ si_make_lambda(cl_object name, cl_object rest)
     the_env->c_env = old_c_env;
     memset(&new_c_env, 0, sizeof(new_c_env));
   } ECL_UNWIND_PROTECT_END;
-  return the_env->values[0];
+  @(return the_env->values[0]);
 @)
 
 void
diff --git a/src/c/eval.d b/src/c/eval.d
index c6bf758be..8d84ab10f 100644
--- a/src/c/eval.d
+++ b/src/c/eval.d
@@ -224,12 +224,6 @@ cl_eval(cl_object form)
     if (ECL_CONS_CAR(form) == @'quote') {
       return cl_second(form);
     }
-    /* value = cl_macroexpand(2, form, env); */
-    /* if (value != form) { */
-    /*   form = value; */
-    /*   goto AGAIN; */
-    /* } */
-  ERROR:
     FEerror("EXT:CONSTANT-FORM-VALUE invoked with a non-constant form ~A",
             0, form);
     break;
diff --git a/src/c/numbers/minus.d b/src/c/numbers/minus.d
index 045e5c919..d92646852 100644
--- a/src/c/numbers/minus.d
+++ b/src/c/numbers/minus.d
@@ -68,6 +68,7 @@ ecl_minus(cl_object x, cl_object y)
         return ecl_make_double_float(ecl_to_double(x) - ecl_double_float(y));
       }
       CASE_RATIO_FIXNUM;
+      // fallthrough
       CASE_RATIO_BIGNUM {
         cl_object z = ecl_times(x->ratio.den, y);
         z = ecl_minus(x->ratio.num, z);
diff --git a/src/c/numbers/times.d b/src/c/numbers/times.d
index 110e6e8a2..40f0c9dc9 100644
--- a/src/c/numbers/times.d
+++ b/src/c/numbers/times.d
@@ -141,9 +141,13 @@ ecl_times(cl_object x, cl_object y)
       }
 #endif
       CASE_COMPLEX_FIXNUM;
+      // fallthrough
       CASE_COMPLEX_BIGNUM;
+      // fallthrough
       CASE_COMPLEX_RATIO;
+      // fallthrough
       CASE_COMPLEX_SINGLE_FLOAT;
+      // fallthrough
       CASE_COMPLEX_DOUBLE_FLOAT; COMPLEX_X: {
         cl_object aux = x;
         x = y; y = aux;
diff --git a/src/c/read.d b/src/c/read.d
index 90a0a5267..174d789bf 100644
--- a/src/c/read.d
+++ b/src/c/read.d
@@ -883,7 +883,7 @@ sharp_asterisk_reader(cl_object in, cl_object c, cl_object d)
   cl_env_ptr env = ecl_process_env();
   cl_index sp = ECL_STACK_INDEX(env);
   cl_object last, elt, x;
-  cl_index dim, dimcount, i;
+  cl_fixnum dim, dimcount, i;
   cl_object rtbl = ecl_current_readtable();
   enum ecl_chattrib a;
 
@@ -1795,7 +1795,7 @@ do_read_delimited_list(int d, cl_object in, bool proper_list)
   return funcall(5, @'gray::stream-read-sequence', stream, sequence, start, end);
   else
 #endif
-    return si_do_read_sequence(sequence, stream, start, end);
+	  @(return si_do_read_sequence(sequence, stream, start, end));
   @)
 
 
diff --git a/src/c/string.d b/src/c/string.d
index 87c1ac8fa..2807a209a 100644
--- a/src/c/string.d
+++ b/src/c/string.d
@@ -603,52 +603,52 @@ string_compare(cl_narg narg, int sign1, int sign2, int case_sensitive, ecl_va_li
 
 @(defun string< (&rest args)
   @
-  return string_compare(narg, -1, -1, 1, args);
+  @(return string_compare(narg, -1, -1, 1, args));
   @)
 
 @(defun string> (&rest args)
   @
-  return string_compare(narg, +1, +1, 1, args);
+  @(return string_compare(narg, +1, +1, 1, args));
   @)
 
 @(defun string<= (&rest args)
   @
-  return string_compare(narg, -1, 0, 1, args);
+  @(return string_compare(narg, -1, 0, 1, args));
   @)
 
 @(defun string>= (&rest args)
   @
-  return string_compare(narg, 0, +1, 1, args);
+  @(return string_compare(narg, 0, +1, 1, args));
   @)
 
 @(defun string/= (&rest args)
   @
-  return string_compare(narg, -1, +1, 1, args);
+  @(return string_compare(narg, -1, +1, 1, args));
   @)
 
 @(defun string-lessp (&rest args)
   @
-  return string_compare(narg, -1, -1, 0, args);
+  @(return string_compare(narg, -1, -1, 0, args));
   @)
 
 @(defun string-greaterp (&rest args)
   @
-  return string_compare(narg, +1, +1, 0, args);
+  @(return string_compare(narg, +1, +1, 0, args));
   @)
 
 @(defun string-not-greaterp (&rest args)
   @
-  return string_compare(narg, -1, 0, 0, args);
+  @(return string_compare(narg, -1, 0, 0, args));
   @)
 
 @(defun string-not-lessp (&rest args)
   @
-  return string_compare(narg, 0, +1, 0, args);
+  @(return string_compare(narg, 0, +1, 0, args));
   @)
 
 @(defun string-not-equal (&rest args)
   @
-  return string_compare(narg, -1, +1, 0, args);
+  @(return string_compare(narg, -1, +1, 0, args));
   @)
 
 bool
@@ -781,7 +781,7 @@ char_upcase(ecl_character c, bool *bp)
 
 @(defun string-upcase (&rest args)
   @
-  return string_case(narg, @[string-upcase], char_upcase, args);
+  @(return string_case(narg, @[string-upcase], char_upcase, args));
   @)
 
 static ecl_character
@@ -792,7 +792,7 @@ char_downcase(ecl_character c, bool *bp)
 
 @(defun string-downcase (&rest args)
   @
-  return string_case(narg, @[string-downcase], char_downcase, args);
+  @(return string_case(narg, @[string-downcase], char_downcase, args));
   @)
 
 static ecl_character
@@ -814,7 +814,7 @@ char_capitalize(ecl_character c, bool *bp)
 
 @(defun string-capitalize (&rest args)
   @
-  return string_case(narg, @[string-capitalize], char_capitalize, args);
+  @(return string_case(narg, @[string-capitalize], char_capitalize, args));
   @)
 
 
@@ -858,17 +858,17 @@ nstring_case(cl_narg narg, cl_object fun, ecl_casefun casefun, ecl_va_list ARGS)
 
 @(defun nstring-upcase (&rest args)
   @
-  return nstring_case(narg, @'nstring-upcase', char_upcase, args);
+  @(return nstring_case(narg, @'nstring-upcase', char_upcase, args));
   @)
 
 @(defun nstring-downcase (&rest args)
   @
-  return nstring_case(narg, @'nstring-downcase', char_downcase, args);
+  @(return nstring_case(narg, @'nstring-downcase', char_downcase, args));
   @)
 
 @(defun nstring-capitalize (&rest args)
   @
-  return nstring_case(narg, @'nstring-capitalize', char_capitalize, args);
+  @(return nstring_case(narg, @'nstring-capitalize', char_capitalize, args));
   @)
 
 @(defun si::base-string-concatenate (&rest args)
diff --git a/src/configure b/src/configure
index 8a8aff61f..0fcff7c89 100755
--- a/src/configure
+++ b/src/configure
@@ -737,7 +737,6 @@ infodir
 docdir
 oldincludedir
 includedir
-runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -867,7 +866,6 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1120,15 +1118,6 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
-  -runstatedir | --runstatedir | --runstatedi | --runstated \
-  | --runstate | --runstat | --runsta | --runst | --runs \
-  | --run | --ru | --r)
-    ac_prev=runstatedir ;;
-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-  | --run=* | --ru=* | --r=*)
-    runstatedir=$ac_optarg ;;
-
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1266,7 +1255,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir runstatedir
+		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1419,7 +1408,6 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -5057,7 +5045,7 @@ LSP_FEATURES="(cons :android ${LSP_FEATURES})"
                 BUNDLE_LDFLAGS="-dy -G ${LDFLAGS}"
                 ECL_LDRPATH='-Wl,-R,~A'
                 TCPLIBS='-lsocket -lnsl -lintl'
-                clibs='${clibs} -ldl'
+                clibs="${clibs} -ldl"
                 SONAME="${SHAREDPREFIX}ecl.${SHAREDEXT}.SOVERSION"
                 SONAME_LDFLAGS="-Wl,-soname,SONAME"
                 if test "x$GCC" = "xyes"; then