diff --git a/apu/bapu/smp/core.cpp b/apu/bapu/smp/core.cpp
index 5303bed7..b46041b4 100644
--- a/apu/bapu/smp/core.cpp
+++ b/apu/bapu/smp/core.cpp
@@ -51,8 +51,8 @@ void SMP::op_write(uint16 addr, uint8 data) {
 
 void SMP::op_step() {
   #define op_readpc() op_read(regs.pc++)
-  #define op_readdp(addr) op_read((regs.p.p << 8) + (addr & 0xff))
-  #define op_writedp(addr, data) op_write((regs.p.p << 8) + (addr & 0xff), data)
+  #define op_readdp(addr) op_read((regs.p.p << 8) + ((addr) & 0xff))
+  #define op_writedp(addr, data) op_write((regs.p.p << 8) + ((addr) & 0xff), data)
   #define op_readaddr(addr) op_read(addr)
   #define op_writeaddr(addr, data) op_write(addr, data)
   #define op_readstack() op_read(0x0100 | ++regs.sp)
diff --git a/apu/resampler.h b/apu/resampler.h
index f4b09c4a..4f8cf6f6 100644
--- a/apu/resampler.h
+++ b/apu/resampler.h
@@ -17,7 +17,7 @@ class Resampler : public ring_buffer
         {
         }
 
-        ~Resampler ()
+        virtual ~Resampler ()
         {
         }
 
diff --git a/controls.cpp b/controls.cpp
index 32c09754..cca9f85f 100644
--- a/controls.cpp
+++ b/controls.cpp
@@ -2879,8 +2879,9 @@ void S9xSetJoypadLatch (bool latch)
 			switch (i = curcontrollers[n])
 			{
 				case MP5:
-					for (int j = 0, k = mp5[n].pads[j]; j < 4; k = mp5[n].pads[++j])
+					for (int j = 0, k; j < 4; ++j)
 					{
+						k = mp5[n].pads[j];
 						if (k == NONE)
 							continue;
 						do_polling(k);
@@ -3170,8 +3171,9 @@ void S9xControlEOF (void)
 		switch (i = curcontrollers[n])
 		{
 			case MP5:
-				for (j = 0, i = mp5[n].pads[j]; j < 4; i = mp5[n].pads[++j])
+				for (j = 0; j < 4; ++j)
 				{
+					i = mp5[n].pads[j];
 					if (i == NONE)
 						continue;
 
diff --git a/loadzip.cpp b/loadzip.cpp
index 840da42e..56e65b67 100644
--- a/loadzip.cpp
+++ b/loadzip.cpp
@@ -270,7 +270,7 @@ bool8 LoadZip (const char *zipname, uint32 *TotalFileSize, uint8 *buffer)
 	uint8	*ptr = buffer;
 	bool8	more = FALSE;
 
-	unzLocateFile(file, filename, NULL);
+	unzLocateFile(file, filename, 0);
 	unzGetCurrentFileInfo(file, &info, filename, 128, NULL, 0, NULL, 0);
 
 	if (unzOpenCurrentFile(file) != UNZ_OK)
@@ -330,7 +330,7 @@ bool8 LoadZip (const char *zipname, uint32 *TotalFileSize, uint8 *buffer)
 
 		if (more)
 		{
-			if (unzLocateFile(file, filename, NULL) != UNZ_OK ||
+			if (unzLocateFile(file, filename, 0) != UNZ_OK ||
 				unzGetCurrentFileInfo(file, &info, filename, 128, NULL, 0, NULL, 0) != UNZ_OK ||
 				unzOpenCurrentFile(file) != UNZ_OK)
 				break;
diff --git a/memmap.cpp b/memmap.cpp
index 3271cc77..b33fe335 100644
--- a/memmap.cpp
+++ b/memmap.cpp
@@ -4054,7 +4054,10 @@ static bool8 ReadBPSPatch (Stream *r, long, int32 &rom_size)
 
 		switch((int)mode) {
 			case SourceRead:
-				while(length--) patched_rom[outputOffset++] = Memory.ROM[outputOffset];
+				while(length--) {
+					patched_rom[outputOffset] = Memory.ROM[outputOffset];
+					outputOffset++;
+				}
 				break;
 			case TargetRead:
 				while(length--) patched_rom[outputOffset++] = data[addr++];
diff --git a/msu1.cpp b/msu1.cpp
index 92b7dad8..e55e3f98 100644
--- a/msu1.cpp
+++ b/msu1.cpp
@@ -240,7 +240,7 @@ static int unzFindExtension(unzFile &file, const char *ext, bool restart = TRUE,
 }
 #endif
 
-STREAM S9xMSU1OpenFile(char *msu_ext, bool skip_unpacked)
+STREAM S9xMSU1OpenFile(const char *msu_ext, bool skip_unpacked)
 {
     const char *filename = S9xGetFilename(msu_ext, ROMFILENAME_DIR);
 	STREAM file = 0;
@@ -388,7 +388,7 @@ bool S9xMSU1ROMExists(void)
 	}
 #ifdef UNZIP_SUPPORT
 	char ext[_MAX_EXT + 1];
-	_splitpath(Memory.ROMFilename, nullptr, nullptr, nullptr, ext);
+	_splitpath(Memory.ROMFilename, NULL, NULL, NULL, ext);
 	if (!strcasecmp(ext, ".msu1"))
 		return true;
 
diff --git a/msu1.h b/msu1.h
index e51739b0..1e6ea15f 100644
--- a/msu1.h
+++ b/msu1.h
@@ -229,7 +229,7 @@ extern struct SMSU1	MSU1;
 void S9xResetMSU(void);
 void S9xMSU1Init(void);
 bool S9xMSU1ROMExists(void);
-STREAM S9xMSU1OpenFile(char *msu_ext, bool skip_unpacked = FALSE);
+STREAM S9xMSU1OpenFile(const char *msu_ext, bool skip_unpacked = FALSE);
 void S9xMSU1Init(void);
 void S9xMSU1Generate(size_t sample_count);
 uint8 S9xMSU1ReadPort(uint8 port);