diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c
index 0a5045a5cbe..5df36a200c8 100644
--- a/lib/ofp-actions.c
+++ b/lib/ofp-actions.c
@@ -5310,7 +5310,8 @@ encode_ofpact(const struct ofpact *a, enum ofp_version ofp_version,
     switch (a->type) {
 #define OFPACT(ENUM, STRUCT, MEMBER, NAME)                              \
         case OFPACT_##ENUM:                                             \
-            return encode_##ENUM(ofpact_get_##ENUM(a), ofp_version, out);
+            encode_##ENUM(ofpact_get_##ENUM(a), ofp_version, out);      \
+            return;
         OFPACTS
 #undef OFPACT
     default:
diff --git a/ovsdb/query.c b/ovsdb/query.c
index 7f6eccd7d60..e288020888b 100644
--- a/ovsdb/query.c
+++ b/ovsdb/query.c
@@ -81,7 +81,8 @@ ovsdb_query_distinct(struct ovsdb_table *table,
 {
     if (!columns || ovsdb_column_set_contains(columns, OVSDB_COL_UUID)) {
         /* All the result rows are guaranteed to be distinct anyway. */
-        return ovsdb_query_row_set(table, condition, results);
+        ovsdb_query_row_set(table, condition, results);
+        return;
     } else {
         /* Use hash table to drop duplicates. */
         struct ovsdb_row_hash_node *node;