diff --git a/src/modules/module-client-node/client-stream.c b/src/modules/module-client-node/client-stream.c
index cbd4291e0..221c17538 100644
--- a/src/modules/module-client-node/client-stream.c
+++ b/src/modules/module-client-node/client-stream.c
@@ -923,12 +923,17 @@ static void client_node_initialized(void *data)
 
 	}
 
-	if (media_type == SPA_MEDIA_TYPE_audio)
+	switch (media_type) {
+	case SPA_MEDIA_TYPE_audio:
 		type = "Audio";
-	else if (media_type == SPA_MEDIA_TYPE_video)
+		break;
+	case SPA_MEDIA_TYPE_video:
 		type = "Video";
-	else
+		break;
+	default:
 		type = "Generic";
+		break;
+	}
 
 	snprintf(media_class, sizeof(media_class), "Stream/%s/%s", dir, type);
 
diff --git a/src/pipewire/core.c b/src/pipewire/core.c
index 5ed3a5491..d4a9e1d34 100644
--- a/src/pipewire/core.c
+++ b/src/pipewire/core.c
@@ -227,8 +227,6 @@ core_create_object(void *object,
 	if (obj == NULL)
 		goto no_mem;
 
-	properties = NULL;
-
       done:
 	return;