diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp
index a44e4e4dd..0b251021e 100644
--- a/Core/HLE/sceAtrac.cpp
+++ b/Core/HLE/sceAtrac.cpp
@@ -406,7 +406,7 @@ struct AtracResetBufferInfo {
 const int PSP_NUM_ATRAC_IDS = 6;
 static bool atracInited = true;
 static Atrac *atracIDs[PSP_NUM_ATRAC_IDS];
-static int atracIDTypes[PSP_NUM_ATRAC_IDS];
+static u32 atracIDTypes[PSP_NUM_ATRAC_IDS];
 
 void __AtracInit() {
 	atracInited = true;
@@ -1547,7 +1547,7 @@ static u32 sceAtracSetData(int atracID, u32 buffer, u32 bufferSize) {
 		int ret = atrac->Analyze();
 		if (ret < 0) {
 			ERROR_LOG_REPORT(ME, "sceAtracSetData(%i, %08x, %08x): bad data", atracID, buffer, bufferSize);
-		} else if ((int)atrac->codecType != atracIDTypes[atracID]) {
+		} else if (atrac->codecType != atracIDTypes[atracID]) {
 			ERROR_LOG_REPORT(ME, "sceAtracSetData(%i, %08x, %08x): atracID uses different codec type than data", atracID, buffer, bufferSize);
 			ret = ATRAC_ERROR_WRONG_CODECTYPE;
 		} else {
diff --git a/Core/HW/StereoResampler.cpp b/Core/HW/StereoResampler.cpp
index 44bc66b80..f3c186636 100644
--- a/Core/HW/StereoResampler.cpp
+++ b/Core/HW/StereoResampler.cpp
@@ -91,7 +91,7 @@ unsigned int StereoResampler::MixerFifo::Mix(short* samples, unsigned int numSam
 	u32 indexW = Common::AtomicLoad(m_indexW);
 
 	// We force on the audio resampler if the output sample rate doesn't match the input.
-	if (!g_Config.bAudioResampler && sample_rate == m_input_sample_rate) {
+	if (!g_Config.bAudioResampler && sample_rate == (int)m_input_sample_rate) {
 		for (; currentSample < numSamples * 2 && ((indexW - indexR) & INDEX_MASK) > 2; currentSample += 2) {
 			u32 indexR2 = indexR + 2; //next sample
 			s16 l1 = m_buffer[indexR & INDEX_MASK]; //current
diff --git a/UI/BackgroundAudio.cpp b/UI/BackgroundAudio.cpp
index 1a02ffe30..b912cb20d 100644
--- a/UI/BackgroundAudio.cpp
+++ b/UI/BackgroundAudio.cpp
@@ -208,7 +208,7 @@ int PlayBackgroundAudio() {
 	double now = time_now();
 	if (at3Reader) {
 		const int sz = (now - lastPlaybackTime) * 44100;
-		if (sz >= 16 && sz < ARRAY_SIZE(buffer)/2) {
+		if (sz >= 16 && sz < (int)ARRAY_SIZE(buffer) / 2) {
 			if (at3Reader->Read(buffer, sz))
 				__PushExternalAudio(buffer, sz);
 		}
diff --git a/native b/native
index d2acef3a3..5f863cbbe 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit d2acef3a3b15683d553a593d1c4ca3decd3b0c41
+Subproject commit 5f863cbbe8e9d90b1b07f7d0b87788ba7cbc2053