diff --git a/src/devices/machine/intelfsh.cpp b/src/devices/machine/intelfsh.cpp
index 8523eb61e24..027340e4736 100644
--- a/src/devices/machine/intelfsh.cpp
+++ b/src/devices/machine/intelfsh.cpp
@@ -739,15 +739,15 @@ void intelfsh_device::write_full(uint32_t address, uint32_t data)
 				logerror("Invalid flash mode byte %x\n", data & 0xff);
 			else
 			{
-			m_status = 0x80;
-			m_flash_mode = FM_READSTATUS;
+				m_status = 0x80;
+				m_flash_mode = FM_READSTATUS;
 			}
 			break;
 		case 0x20:  // block erase
 			if (m_type == FLASH_SST_49LF020)
 				logerror("Unknown flash mode byte %x\n", data & 0xff);
 			else
-			m_flash_mode = FM_CLEARPART1;
+				m_flash_mode = FM_CLEARPART1;
 			break;
 		case 0x60:  // set master lock
 			m_flash_mode = FM_SETMASTER;
@@ -923,7 +923,7 @@ void intelfsh_device::write_full(uint32_t address, uint32_t data)
 				memset(&m_data[0x3C000], 0xff, 0x04000);
 			}
 			else
-			memset(&m_data[0], 0xff, m_size);
+				memset(&m_data[0], 0xff, m_size);
 
 			m_status = 1 << 3;
 			m_flash_mode = FM_ERASEAMD4;
diff --git a/src/devices/machine/sunplus_gcm394.cpp b/src/devices/machine/sunplus_gcm394.cpp
index ceef80a6776..303d334d221 100644
--- a/src/devices/machine/sunplus_gcm394.cpp
+++ b/src/devices/machine/sunplus_gcm394.cpp
@@ -10,12 +10,11 @@
 #include "sunplus_gcm394.h"
 
 
-
-#define LOG_GCM394_SPI            (1U << 4)
-#define LOG_GCM394_IO             (1U << 3)
-#define LOG_GCM394_SYSDMA         (1U << 2)
-#define LOG_GCM394                (1U << 1)
-#define LOG_GCM394_UNMAPPED       (1U << 0)
+#define LOG_GCM394_SPI            (1U << 5)
+#define LOG_GCM394_IO             (1U << 4)
+#define LOG_GCM394_SYSDMA         (1U << 3)
+#define LOG_GCM394                (1U << 2)
+#define LOG_GCM394_UNMAPPED       (1U << 1)
 
 #define VERBOSE             (LOG_GCM394 | LOG_GCM394_UNMAPPED | LOG_GCM394_SYSDMA)
 #include "logmacro.h"
@@ -124,7 +123,7 @@ READ16_MEMBER(sunplus_gcm394_base_device::system_dma_status_r)
 	// bit 0 = channel 0 ready
 	// bit 1 = channel 1 ready
 
-	return 0x00FF;
+	return 0x00ff;
 }
 
 void sunplus_gcm394_base_device::trigger_systemm_dma(address_space &space, int channel)
diff --git a/src/devices/sound/ks0164.h b/src/devices/sound/ks0164.h
index a89d30b96d0..19167a712d9 100644
--- a/src/devices/sound/ks0164.h
+++ b/src/devices/sound/ks0164.h
@@ -3,8 +3,8 @@
 
 // Samsung KS0164 wavetable chip
 
-#ifndef DEVICES_SOUND_KS0164_H
-#define DEVICES_SOUND_KS0164_H
+#ifndef MAME_SOUND_KS0164_H
+#define MAME_SOUND_KS0164_H
 
 #pragma once
 
diff --git a/src/devices/video/ppu2c0x_sh6578.cpp b/src/devices/video/ppu2c0x_sh6578.cpp
index 0514d7dcc8d..c74fa5e54fb 100644
--- a/src/devices/video/ppu2c0x_sh6578.cpp
+++ b/src/devices/video/ppu2c0x_sh6578.cpp
@@ -7,10 +7,9 @@
 #include "emu.h"
 #include "video/ppu2c0x_sh6578.h"
 
-#define LOG_PPU_EXTRA       (1U << 0)
+#define LOG_PPU_EXTRA       (1U << 1)
 
 //#define VERBOSE             (LOG_PPU_EXTRA)
-#define VERBOSE             (0)
 
 #include "logmacro.h"
 
diff --git a/src/mame/drivers/nes_sh6578.cpp b/src/mame/drivers/nes_sh6578.cpp
index e7c3599361c..e516ab685a3 100644
--- a/src/mame/drivers/nes_sh6578.cpp
+++ b/src/mame/drivers/nes_sh6578.cpp
@@ -20,8 +20,8 @@
 #include "machine/bankdev.h"
 #include "machine/timer.h"
 
-#define LOG_DMA       (1U << 1)
-#define LOG_PPU       (1U << 0)
+#define LOG_DMA       (1U << 2)
+#define LOG_PPU       (1U << 1)
 
 //#define VERBOSE             (LOG_PPU)
 #define VERBOSE             (0)
diff --git a/src/mame/drivers/sunplus_unsp20soc.cpp b/src/mame/drivers/sunplus_unsp20soc.cpp
index 84dc1335cae..d79b870d93a 100644
--- a/src/mame/drivers/sunplus_unsp20soc.cpp
+++ b/src/mame/drivers/sunplus_unsp20soc.cpp
@@ -1873,5 +1873,3 @@ void generalplus_gpspispi_game_state::init_spi()
 
 
 CONS(200?, bkrankp, 0, 0, generalplus_gpspispi_bkrankp, gcm394, generalplus_gpspispi_bkrankp_game_state , init_spi, "Bandai", "Karaoke Ranking Party (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-
-