diff --git a/rpcs3/Emu/Cell/PPUThread.cpp b/rpcs3/Emu/Cell/PPUThread.cpp
index 668adf7ecc..e1b421d2a1 100644
--- a/rpcs3/Emu/Cell/PPUThread.cpp
+++ b/rpcs3/Emu/Cell/PPUThread.cpp
@@ -550,8 +550,7 @@ extern bool ppu_breakpoint(u32 addr, bool is_adding)
 		std::swap(to_set, expected);
 	}
 
-	auto& ref = reinterpret_cast<atomic_t<u64>&>(ppu_ref(addr));
-	return ref.compare_and_swap_test(expected, to_set);
+	return atomic_storage<u64>::compare_exchange(ppu_ref(addr), expected, to_set);
 }
 
 extern bool ppu_patch(u32 addr, u32 value)
diff --git a/rpcs3/util/media_utils.cpp b/rpcs3/util/media_utils.cpp
index 84c836fd0e..558c46d925 100644
--- a/rpcs3/util/media_utils.cpp
+++ b/rpcs3/util/media_utils.cpp
@@ -145,7 +145,7 @@ namespace utils
 		info.duration_us = av_format_ctx->duration;
 
 		AVDictionaryEntry* tag = nullptr;
-		while (tag = av_dict_get(av_format_ctx->metadata, "", tag, AV_DICT_IGNORE_SUFFIX))
+		while ((tag = av_dict_get(av_format_ctx->metadata, "", tag, AV_DICT_IGNORE_SUFFIX)))
 		{
 			info.metadata[tag->key] = tag->value;
 		}