diff --git a/src/boards/BS110.c b/src/boards/BS110.c
index fc5e31f..18212f8 100644
--- a/src/boards/BS110.c
+++ b/src/boards/BS110.c
@@ -28,7 +28,6 @@ static uint32 WRAMSIZE;
 static uint8 mmc3_reg[8];
 static uint8 exRegs[8];
 static uint8 pointer;
-static uint8 locked;
 static uint8 readDIP;
 static uint16 prgAND;
 static uint16 chrAND;
@@ -57,15 +56,15 @@ static SFORMAT BS110_StateRegs[] =
 
 int BS110GetPRGBank(int bank)
 {
-	if (~bank & 1 && (pointer & 0x40)) bank ^= 2;
-	return bank & 2 ? 0xFE | bank & 1 : mmc3_reg[6 | bank & 1];
+	if ((~bank & 1) && (pointer & 0x40)) bank ^= 2;
+	return (bank & 2) ? 0xFE | (bank & 1) : mmc3_reg[6 | (bank & 1)];
 }
 
 void BS110SyncPRG_GNROM(int A14, int AND, int OR) {
-	setprg8(0x8000, (BS110GetPRGBank(0) &~A14) &AND | OR);
-	setprg8(0xA000, (BS110GetPRGBank(1) &~A14) &AND | OR);
-	setprg8(0xC000, (BS110GetPRGBank(0) | A14) &AND | OR);
-	setprg8(0xE000, (BS110GetPRGBank(1) | A14) &AND | OR);
+	setprg8(0x8000, ((BS110GetPRGBank(0) &~A14) &AND) | OR);
+	setprg8(0xA000, ((BS110GetPRGBank(1) &~A14) &AND) | OR);
+	setprg8(0xC000, ((BS110GetPRGBank(0) | A14) &AND) | OR);
+	setprg8(0xE000, ((BS110GetPRGBank(1) | A14) &AND) | OR);
 }
 
 static void BS110CW(uint32 A, uint8 V) {
@@ -83,18 +82,18 @@ static void BS110PW(uint32 A, uint8 V) {
 		uint8 block = (exRegs[1] & 3) << 4;
 		if ((exRegs[1] >> 3) & 0x01)
 		{
-			setprg8(0x8000, (BS110GetPRGBank(0)) & mask | block);
-			setprg8(0xA000, (BS110GetPRGBank(1)) & mask | block);
-			setprg8(0xC000, (BS110GetPRGBank(0)) & mask | block);
-			setprg8(0xE000, (BS110GetPRGBank(1)) & mask | block);
+			setprg8(0x8000, ((BS110GetPRGBank(0)) & mask) | block);
+			setprg8(0xA000, ((BS110GetPRGBank(1)) & mask) | block);
+			setprg8(0xC000, ((BS110GetPRGBank(0)) & mask) | block);
+			setprg8(0xE000, ((BS110GetPRGBank(1)) & mask) | block);
 		}
 		else
 		{
 
-			setprg8(0x8000, (BS110GetPRGBank(0)) & mask | block);
-			setprg8(0xA000, (BS110GetPRGBank(1)) & mask | block);
-			setprg8(0xC000, (BS110GetPRGBank(0) | 2) & mask | block);
-			setprg8(0xE000, (BS110GetPRGBank(1) | 2) & mask | block);
+			setprg8(0x8000, ((BS110GetPRGBank(0)) & mask) | block);
+			setprg8(0xA000, ((BS110GetPRGBank(1)) & mask) | block);
+			setprg8(0xC000, ((BS110GetPRGBank(0) | 2) & mask) | block);
+			setprg8(0xE000, ((BS110GetPRGBank(1) | 2) & mask) | block);
 		}
 	}
 	else
diff --git a/src/boards/Bs5652.c b/src/boards/Bs5652.c
index 01dff41..a7e9a93 100644
--- a/src/boards/Bs5652.c
+++ b/src/boards/Bs5652.c
@@ -70,15 +70,15 @@ void Bs5652AnalyzeReg()
 
 int Bs5652GetPRGBank(int bank)
 {
-	if (~bank & 1 && (pointer & 0x40)) bank ^= 2;
-	return bank & 2 ? 0xFE | bank & 1 : mmc3_reg[6 | bank & 1];
+	if ((~bank & 1) && (pointer & 0x40)) bank ^= 2;
+	return (bank & 2) ? 0xFE | (bank & 1) : mmc3_reg[6 | (bank & 1)];
 }	
 		
 void Bs5652SyncPRG_GNROM(int A14, int AND, int OR) {
-	setprg8(0x8000, (Bs5652GetPRGBank(0) &~A14) &AND | OR);
-	setprg8(0xA000, (Bs5652GetPRGBank(1) &~A14) &AND | OR);
-	setprg8(0xC000, (Bs5652GetPRGBank(0) | A14) &AND | OR);
-	setprg8(0xE000, (Bs5652GetPRGBank(1) | A14) &AND | OR);
+	setprg8(0x8000, ((Bs5652GetPRGBank(0) &~A14) &AND) | OR);
+	setprg8(0xA000, ((Bs5652GetPRGBank(1) &~A14) &AND) | OR);
+	setprg8(0xC000, ((Bs5652GetPRGBank(0) | A14) &AND) | OR);
+	setprg8(0xE000, ((Bs5652GetPRGBank(1) | A14) &AND) | OR);
 }
 
 static void Bs5652CW(uint32 A, uint8 V) {
diff --git a/src/boards/KG256.c b/src/boards/KG256.c
index a86c6c8..a2ac180 100644
--- a/src/boards/KG256.c
+++ b/src/boards/KG256.c
@@ -40,17 +40,17 @@ static void Sync(void)
 		r = 1;
 	if ((regs[1] >> 4) & 0x01)
 	{
-		setprg16(0x8000, regs[1] & 0x07 | (r) << 3);
-		setprg16(0xC000, regs[1] & 0x07 | (r) << 3);
-		setchr8(regs[0] & 0x07 | (r) << 3);
+		setprg16(0x8000, (regs[1] & 0x07) | (r << 3));
+		setprg16(0xC000, (regs[1] & 0x07) | (r << 3));
+		setchr8((regs[0] & 0x07) | (r << 3));
 	}
 	else
 	{
-		setprg32(0x8000, (regs[1] >> 1) & 0x03 | (r) << 2);
-		setchr8(regs[2] & 0x01 | (r) << 3);
+		setprg32(0x8000, ((regs[1] >> 1) & 0x03) | (r << 2));
+		setchr8((regs[2] & 0x01) | (r << 3));
 	}
 
-	mirr = (((regs[0] >> 4 & 0x1)));
+	mirr = (((regs[0] >> 4) & 0x1));
 
 	if (mirr)
 		setmirror(0);
diff --git a/src/boards/NC7000M.c b/src/boards/NC7000M.c
index df12d5a..9925e65 100644
--- a/src/boards/NC7000M.c
+++ b/src/boards/NC7000M.c
@@ -64,22 +64,22 @@ void NC7000MAnalyzeReg()
 	prgAND = (reg & 0x08 ? 0x0F : 0x1F);
 	chrAND = (reg & 0x40 ? 0x7F : 0xFF);
 	prgOR = (reg << 4 & 0x30);
-	chrOR = (reg << 3 & 0x080 | reg & 0x100);
+	chrOR = ((reg << 3) & 0x080) | (reg & 0x100);
 	nrom = (reg & 0x20);
 	nrom256 = (reg & 0x04);
 }
 
 int NC7000MGetPRGBank(int bank)
 {
-	if (~bank & 1 && (pointer & 0x40)) bank ^= 2;
-	return bank & 2 ? 0xFE | bank & 1 : mmc3_reg[6 | bank & 1];
+	if ((~bank & 1) && (pointer & 0x40)) bank ^= 2;
+	return (bank & 2) ? 0xFE | (bank & 1) : mmc3_reg[6 | (bank & 1)];
 }	
 		
 void NC7000MSyncPRG_GNROM(int A14, int AND, int OR) {
-	setprg8(0x8000, (NC7000MGetPRGBank(0) &~A14) &AND | OR);
-	setprg8(0xA000, (NC7000MGetPRGBank(1) &~A14) &AND | OR);
-	setprg8(0xC000, (NC7000MGetPRGBank(0) | A14) &AND | OR);
-	setprg8(0xE000, (NC7000MGetPRGBank(1) | A14) &AND | OR);
+	setprg8(0x8000, ((NC7000MGetPRGBank(0) &~A14) &AND) | OR);
+	setprg8(0xA000, ((NC7000MGetPRGBank(1) &~A14) &AND) | OR);
+	setprg8(0xC000, ((NC7000MGetPRGBank(0) | A14) &AND) | OR);
+	setprg8(0xE000, ((NC7000MGetPRGBank(1) | A14) &AND) | OR);
 }
 
 static void NC7000MCW(uint32 A, uint8 V) {
@@ -124,7 +124,7 @@ static DECLFW(NC7000MWriteHi) {
 static DECLFW(NC7000MWriteLo) {
 
 	if (!(reg & 0x80)) {
-		reg = V | A & 0x100;
+		reg = V | (A & 0x100);
 		NC7000MAnalyzeReg();
 		FixMMC3PRG(MMC3_cmd);
 		FixMMC3CHR(MMC3_cmd);
@@ -134,10 +134,6 @@ static DECLFW(NC7000MWriteLo) {
 		WRAM[A - 0x6000] = V;
 	}
 }
-static DECLFR(NC7000MReadHi)
-{
-	return CartBR(A);
-}
 
 static void NC7000MPower(void) {
 	mmc3_reg[0] = 0x00; mmc3_reg[1] = 0x02;
diff --git a/src/boards/mmc1.c b/src/boards/mmc1.c
index b9698c6..d0ac444 100644
--- a/src/boards/mmc1.c
+++ b/src/boards/mmc1.c
@@ -66,15 +66,6 @@ static DECLFR(MAWRAM) {
 	return(Page[A >> 11][A]);
 }
 
-static void MMC1WRAM(void) {
-	if (WRAMSIZE > 8192) {
-		if (WRAMSIZE > 16384)
-			setprg8r(0x10, 0x6000, (DRegs[1] >> 2) & 3);
-		else
-			setprg8r(0x10, 0x6000, (DRegs[1] >> 3) & 1);
-	}
-}
-
 static void MMC1CHR(void) {
 	if (MMC1WRAMHook8)		/* Use custom wram hook, currently used for M543 */
 		MMC1WRAMHook8();
diff --git a/src/unif.c b/src/unif.c
index 18acb84..9fdf4e4 100644
--- a/src/unif.c
+++ b/src/unif.c
@@ -312,7 +312,7 @@ static int SetBoardName(FCEUFILE *fp) {
 	FCEU_fread(boardname, 1, uchead.info, fp);
 	boardname[uchead.info] = 0;
 	/* strip whitespaces */
-	boardname = string_trim_whitespace((char const*)boardname);
+	boardname = (uint8*)string_trim_whitespace((char *const)boardname);
 	FCEU_printf(" Board name: %s\n", boardname);
 	sboardname = boardname;
 	if (!memcmp(boardname, "NES-", 4) || !memcmp(boardname, "UNL-", 4) ||