diff --git a/src/boards/225.c b/src/boards/225.c
index 12576d5..846f965 100644
--- a/src/boards/225.c
+++ b/src/boards/225.c
@@ -53,7 +53,7 @@ static void Sync(void) {
 }
 
 static DECLFW(M225Write) {
-	uint32 bank = (A >> 14) & 1;
+	uint8 bank = (A >> 14) & 1;
 	mirr = (A >> 13) & 1;
 	mode = (A >> 12) & 1;
 	chr = (A & 0x3f) | (bank << 6);
diff --git a/src/boards/269.c b/src/boards/269.c
index 2f21df8..0fcf287 100644
--- a/src/boards/269.c
+++ b/src/boards/269.c
@@ -31,7 +31,7 @@ static uint8 *CHRROM;
 static uint32 CHRROMSIZE;
 
 static void M269CW(uint32 A, uint8 V) {
-	uint32 NV = V;
+	uint16 NV = V;
 	if (EXPREGS[2] & 8)
 		NV &= (1 << ((EXPREGS[2] & 7) + 1)) - 1;
 	NV |= EXPREGS[0] | ((EXPREGS[2] & 0xF0) << 4);
@@ -39,7 +39,7 @@ static void M269CW(uint32 A, uint8 V) {
 }
 
 static void M269PW(uint32 A, uint8 V) {
-	uint32 MV = V & ((EXPREGS[3] & 0x3F) ^ 0x3F);
+	uint16 MV = V & ((EXPREGS[3] & 0x3F) ^ 0x3F);
 	MV |= EXPREGS[1];
 	MV |= ((EXPREGS[3] & 0x40) << 2);
 	setprg8(A, MV);
diff --git a/src/boards/353.c b/src/boards/353.c
index 10a49a6..c900dcd 100644
--- a/src/boards/353.c
+++ b/src/boards/353.c
@@ -41,7 +41,7 @@ static void M353PPU(uint32 A) {
 }
 
 static void M353PW(uint32 A, uint8 V) {
-	uint32 bank = V;
+	uint8 bank = V;
 
 	if (EXPREGS[0] == 2) {
 		bank &= 0x0F;
diff --git a/src/boards/356.c b/src/boards/356.c
index c5dc93f..67049cf 100644
--- a/src/boards/356.c
+++ b/src/boards/356.c
@@ -30,7 +30,7 @@ static uint32 CHRRAMSIZE = 0;
 
 static void M356CW(uint32 A, uint8 V) {
 	if (EXPREGS[2] & 0x20) {
-		uint32 NV = V;
+		uint8 NV = V;
 		if (EXPREGS[2] & 8)
 			NV &= (1 << ((EXPREGS[2] & 7) + 1)) - 1;
 		else
@@ -43,7 +43,7 @@ static void M356CW(uint32 A, uint8 V) {
 }
 
 static void M356PW(uint32 A, uint8 V) {
-	uint32 MV = V & ((EXPREGS[3] & 0x3F) ^ 0x3F);
+	uint8 MV = V & ((EXPREGS[3] & 0x3F) ^ 0x3F);
 	MV |= EXPREGS[1];
 	if (UNIFchrrama)
 		MV |= ((EXPREGS[2] & 0x40) << 2);
diff --git a/src/boards/357.c b/src/boards/357.c
index 971dc02..2c28e9e 100644
--- a/src/boards/357.c
+++ b/src/boards/357.c
@@ -31,8 +31,8 @@ static uint8 preg[4];
 static uint8 dipswitch;
 static uint32 IRQCount, IRQa;
 
-static uint8 banks[8] = { 4, 3, 5, 3, 6, 3, 7, 3 };
-static uint8 outer_bank[4] = { 0x00, 0x08, 0x10, 0x18 };
+static const uint8 banks[8] = { 4, 3, 5, 3, 6, 3, 7, 3 };
+static const uint8 outer_bank[4] = { 0x00, 0x08, 0x10, 0x18 };
 
 static SFORMAT StateRegs[] =
 {
diff --git a/src/boards/359.c b/src/boards/359.c
index 926302a..123e344 100644
--- a/src/boards/359.c
+++ b/src/boards/359.c
@@ -52,8 +52,8 @@ static SFORMAT StateRegs[] = {
 };
 
 static void Sync(void) {
-	uint32 prgMask = 0x3F;
-	uint32 prgOuterBank = (exRegs[0] & 0x38) << 1;
+	uint8 prgMask = 0x3F;
+	uint8 prgOuterBank = (exRegs[0] & 0x38) << 1;
 
 	switch (exRegs[1] & 3) {
 	case 0: prgMask = 0x3F; break;
@@ -71,9 +71,10 @@ static void Sync(void) {
 	if (!UNIFchrrama) {
 		switch (mapperNum) {
 		case 359: {
-			uint32 chrMask = (exRegs[1] & 0x40) ? 0xFF : 0x7F;
-			uint32 chrOuterBank = (exRegs[3] << 7);
-			uint32 i;
+			uint8 i;
+			uint8 chrMask = (exRegs[1] & 0x40) ? 0xFF : 0x7F;
+			uint16 chrOuterBank = (exRegs[3] << 7);
+			
 			for (i = 0; i < 8; i++)
 				setchr1(i << 10, (creg[i] & chrMask) | chrOuterBank);
 		} break;
@@ -123,19 +124,19 @@ static DECLFW(M359WriteIRQ) {
 }
 
 static DECLFW(M359WritePRG) {
-	uint32 i = A & 3;
+	uint8 i = A & 3;
 	preg[i] = V;
 	Sync();
 }
 
 static DECLFW(M359WriteCHR) {
-	uint32 i = ((A >> 10) & 4) | (A & 3);
+	uint8 i = ((A >> 10) & 4) | (A & 3);
 	creg[i] = V;
 	Sync();
 }
 
 static DECLFW(M359WriteEx) {
-	uint32 i = A & 3;
+	uint8 i = A & 3;
 	exRegs[i] = V;
 	Sync();
 }
diff --git a/src/boards/369.c b/src/boards/369.c
index 5a44da5..a11a439 100644
--- a/src/boards/369.c
+++ b/src/boards/369.c
@@ -29,9 +29,6 @@ static uint8 smb2_reg;
 static uint8 smb2j_enabled;
 static uint16 smb2j_count;
 
-static uint32 WRAMSIZE;
-static uint8 *WRAM;
-
 static SFORMAT StateRegs[] = {
 	{ &mode, 1, "MODE" },
 	{ &mmc3_reload, 1, "IRQR" },
diff --git a/src/boards/txcchip.c b/src/boards/txcchip.c
index 205e27a..a361cc8 100644
--- a/src/boards/txcchip.c
+++ b/src/boards/txcchip.c
@@ -65,7 +65,8 @@ typedef struct {
 
 static TXC txc;
 
-static void (*WSync)(void);
+static void Dummyfunc(void) { };
+static void (*WSync)(void) = Dummyfunc;
 
 static SFORMAT StateRegs[] =
 {