diff --git a/src/plugins/memif/memif_test.c b/src/plugins/memif/memif_test.c
index cbef4df..a7c23da 100644
--- a/src/plugins/memif/memif_test.c
+++ b/src/plugins/memif/memif_test.c
@@ -186,10 +186,10 @@
       strncpy ((char *) mp->socket_filename, (char *) socket_filename, 127);
       vec_free (socket_filename);
     }
-  if (socket_filename != 0)
+  if (secret != 0)
     {
       strncpy ((char *) mp->secret, (char *) secret, 16);
-      vec_free (socket_filename);
+      vec_free (secret);
     }
   memcpy (mp->hw_addr, hw_addr, 6);
   mp->rx_queues = rx_queues;
diff --git a/src/vnet/mpls/mpls_api.c b/src/vnet/mpls/mpls_api.c
index 2af6af8..a44b1a2 100644
--- a/src/vnet/mpls/mpls_api.c
+++ b/src/vnet/mpls/mpls_api.c
@@ -68,9 +68,6 @@
   vnm = vnet_get_main ();
   vnm->api_errno = 0;
 
-
-  rv = (rv == 0) ? vnm->api_errno : rv;
-
   REPLY_MACRO (VL_API_MPLS_TABLE_ADD_DEL_REPLY);
 }
 
diff --git a/src/vppinfra/bihash_template.c b/src/vppinfra/bihash_template.c
index 704d165..2a5a5cd 100644
--- a/src/vppinfra/bihash_template.c
+++ b/src/vppinfra/bihash_template.c
@@ -509,10 +509,11 @@
 
   for (i = 0; i < BIHASH_KVP_CACHE_SIZE; i++)
     s = format (s, "[%d] ", ((cache_lru >> (3 * i)) & 7));
+
+  return (s);
 #else
   return format (s, "cache not configured");
 #endif
-  return (s);
 }
 
 void