diff --git a/lib_com/tools.c b/lib_com/tools.c
index cb1d1216294bbc815b258866a51a99d99d822298..224c28fa4ed6d208edd4a44e68cae6c36f376395 100644
--- a/lib_com/tools.c
+++ b/lib_com/tools.c
@@ -1743,9 +1743,11 @@ int16_t is_numeric_float(
     float x )
 {
 #ifdef CODE_IMPROVEMENTS
+    int16_t retval;
 #define WMC_TOOL_SKIP
-    return (int16_t) ( !isnan( x ) && !isinf( x ) );
+    retval = (int16_t) ( !isnan( x ) && !isinf( x ) );
 #undef WMC_TOOL_SKIP
+    return retval;
 #else
 #ifndef BASOP_NOGLOB
     union float_int
diff --git a/lib_rend/lib_rend.c b/lib_rend/lib_rend.c
index d9866de0506d69dab80fcab91c815c8ec85ada04..214712487a239a0a3ebfb390e1abe5b1cef7459f 100644
--- a/lib_rend/lib_rend.c
+++ b/lib_rend/lib_rend.c
@@ -3308,10 +3308,14 @@ static void *getInputByIndex(
         case IVAS_REND_AUDIO_CONFIG_TYPE_MASA:
             return (input_masa *) inputsArray + index;
         default:
-            /* this should be unreachable */
-            assert( 0 );
-            return NULL;
+            break;
     }
+
+    /* this should be unreachable */
+    assert( 0 );
+
+    /* include a final return to make the linter happy and avoid problems with wmc_tool (see #1355) */
+    return NULL;
 }
 #endif