diff --git a/src/boards/224.c b/src/boards/224.c
index 8fd7a19..7c885b7 100644
--- a/src/boards/224.c
+++ b/src/boards/224.c
@@ -28,7 +28,7 @@
 #include "mmc3.h"
 
 static void M224PW(uint32 A, uint8 V) {
-	setprg8(A, V & 0x3f | (EXPREGS[0] << 4) & 0x40);
+	setprg8(A, (V & 0x3f) | ((EXPREGS[0] << 4) & 0x40));
 }
 
 static DECLFW(Mapper224Write) {
diff --git a/src/boards/28.c b/src/boards/28.c
index 2cb95f0..4fdd088 100644
--- a/src/boards/28.c
+++ b/src/boards/28.c
@@ -72,51 +72,51 @@ static void Sync() {
 		break;
 	case 0x10:
 	case 0x14:
-		prglo = outb & ~2 | prg << 1 & 2;
-		prghi = outb & ~2 | prg << 1 & 2 | 1;
+		prglo = (outb & ~2) | (prg << 1 & 2);
+		prghi = (outb & ~2) | (prg << 1 & 2) | 1;
 		break;
 	case 0x20:
 	case 0x24:
-		prglo = outb & ~6 | prg << 1 & 6;
-		prghi = outb & ~6 | prg << 1 & 6 | 1;
+		prglo = (outb & ~6) | (prg << 1 & 6);
+		prghi = (outb & ~6) | (prg << 1 & 6) | 1;
 		break;
 	case 0x30:
 	case 0x34:
-		prglo = outb & ~14 | prg << 1 & 14;
-		prghi = outb & ~14 | prg << 1 & 14 | 1;
+		prglo = (outb & ~14) | (prg << 1 & 14);
+		prghi = (outb & ~14) | (prg << 1 & 14) | 1;
 		break;
 	/* bottom fixed modes */
 	case 0x08:
 		prglo = outb;
-		prghi = outb | prg & 1;
+		prghi = outb | (prg & 1);
 		break;
 	case 0x18:
 		prglo = outb;
-		prghi = outb & ~2 | prg & 3;
+		prghi = (outb & ~2) | (prg & 3);
 		break;
 	case 0x28:
 		prglo = outb;
-		prghi = outb & ~6 | prg & 7;
+		prghi = (outb & ~6) | (prg & 7);
 		break;
 	case 0x38:
 		prglo = outb;
-		prghi = outb & ~14 | prg & 15;
+		prghi = (outb & ~14) | (prg & 15);
 		break;
 	/* top fixed modes */
 	case 0x0c:
-		prglo = outb | prg & 1;
+		prglo = outb | (prg & 1);
 		prghi = outb | 1;
 		break;
 	case 0x1c:
-		prglo = outb & ~2 | prg & 3;
+		prglo = (outb & ~2) | (prg & 3);
 		prghi = outb | 1;
 		break;
 	case 0x2c:
-		prglo = outb & ~6 | prg & 7;
+		prglo = (outb & ~6) | (prg & 7);
 		prghi = outb | 1;
 		break;
 	case 0x3c:
-		prglo = outb & ~14 | prg & 15;
+		prglo = (outb & ~14) | (prg & 15);
 		prghi = outb | 1;
 		break;
 	}
diff --git a/src/boards/KS7032.c b/src/boards/KS7032.c
index 7a8bdfc..41739af 100644
--- a/src/boards/KS7032.c
+++ b/src/boards/KS7032.c
@@ -93,7 +93,7 @@ static DECLFW(UNLKS7032Write) {
 	case 0xF000: {
 		uint8 bank = (cmd - 1);
 		if (bank < 3)
-			reg[bank] = reg[bank] & 0x10 | V & 0x0F;
+			reg[bank] = (reg[bank] & 0x10) | (V & 0x0F);
 		else if (bank < 4)
 			reg[bank] = V;
 		Sync();
@@ -101,7 +101,7 @@ static DECLFW(UNLKS7032Write) {
 		case 0xF000:
 			A &= 3;
 			if (A < 3)
-				reg[bank] = reg[bank] & 0x0F | V & 0x10;
+				reg[bank] = (reg[bank] & 0x0F) | (V & 0x10);
 			Sync();
 			break;
 		case 0xF800:
diff --git a/src/ines.c b/src/ines.c
index 6ca2069..94f6087 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -515,7 +515,7 @@ static BMAPPINGLocal bmap[] = {
 	{(uint8_t*)"MMC3 PIRATE H2288",	123, UNLH2288_Init},
 /*	{(uint8_t*)"",					124, Mapper124_Init}, */
 	{(uint8_t*)"FDS LH32",			125, LH32_Init},
-	{(uint8_t*)"PowerJoy 84-in-1",			126, Mapper126_Init},
+	{(uint8_t*)"PowerJoy 84-in-1 PJ-008",		126, Mapper126_Init},
 /*	{(uint8_t*)"",					127, Mapper127_Init}, */
 /*	{(uint8_t*)"",					128, Mapper128_Init}, */
 /*	{(uint8_t*)"",					129, Mapper129_Init}, */