Index: ram/barbadj.c
===================================================================
--- ram/barbadj.c	(revision 2ff13673de10cff1730d23fc4bb93f4550752ea2)
+++ ram/barbadj.c	(revision 7c5def4322be4f432cd667d03c188624872c8022)
@@ -159,5 +159,5 @@
 
 		while (barpos++ LE newbar)	/* write new dots */
-			LCD_WD = (uint8_t)bardot;
+			LCD_WD = bardot;
 
 		while (barpos++ < BTop)		/* erase old dots */
Index: ram/im700.c
===================================================================
--- ram/im700.c	(revision 2ff13673de10cff1730d23fc4bb93f4550752ea2)
+++ ram/im700.c	(revision 7c5def4322be4f432cd667d03c188624872c8022)
@@ -597,5 +597,5 @@
 	memset(keystat, 0, 24);		/* clear front panel key status */
 	memset(trgtab, 	0, NTRIGS);	/* clear trigger status table */
-	memset(mctlval, 0, 2 * NCTRLS);	/* clear MIDI controller values */
+	memsetw(mctlval, 0, NCTRLS);	/* clear MIDI controller values */
 
 	memsetw(grpmode, 0, 12);	/* set all groups to PLAY */
Index: ram/instdsp.c
===================================================================
--- ram/instdsp.c	(revision 2ff13673de10cff1730d23fc4bb93f4550752ea2)
+++ ram/instdsp.c	(revision 7c5def4322be4f432cd667d03c188624872c8022)
@@ -431,5 +431,5 @@
 */
 
-void pltws(uint16_t ws[], int16_t pen)
+void pltws(int16_t ws[], int16_t pen)
 {
 	register int16_t i, x, y;
@@ -438,5 +438,5 @@
 
 		x = 382 + (i >> 1);
-		y = 348 - (int16_t)((ws[i] ^ 0x8000) / 676);
+		y = 348 - (int16_t)(((uint16_t)ws[i] ^ 0x8000) / 676);
 
 		idpoint(x, y, pen);
Index: ram/instdsp.x
===================================================================
--- ram/instdsp.x	(revision 2ff13673de10cff1730d23fc4bb93f4550752ea2)
+++ ram/instdsp.x	(revision 7c5def4322be4f432cd667d03c188624872c8022)
@@ -45,5 +45,5 @@
 extern	int16_t		irand(int16_t range);
 extern	void		oscdsp(int16_t row, int16_t val, int16_t n, int8_t *lbl, int16_t frq);
-extern	void		pltws(uint16_t ws[], int16_t pen);
+extern	void		pltws(int16_t ws[], int16_t pen);
 extern	void		reshowi(void);
 extern	int16_t		xgetran(int16_t mlt);
Index: ram/showcfg.c
===================================================================
--- ram/showcfg.c	(revision 2ff13673de10cff1730d23fc4bb93f4550752ea2)
+++ ram/showcfg.c	(revision 7c5def4322be4f432cd667d03c188624872c8022)
@@ -368,5 +368,5 @@
 void dispws(int16_t ws)
 {
-	register uint16_t *wsp;
+	register int16_t *wsp;
 	register int16_t i, x, y;
 	int8_t buf[64];
@@ -385,5 +385,5 @@
 
 		x = LftEdge + (i >> 1);
-		y = BotEdge - (int16_t)((wsp[i] ^ 0x8000) / 676);
+		y = BotEdge - (int16_t)(((uint16_t)wsp[i] ^ 0x8000) / 676);
 
 		idpoint(x, y, WSBFC);
Index: ram/tundsp.c
===================================================================
--- ram/tundsp.c	(revision 2ff13673de10cff1730d23fc4bb93f4550752ea2)
+++ ram/tundsp.c	(revision 7c5def4322be4f432cd667d03c188624872c8022)
@@ -340,5 +340,5 @@
 	bfs[0] = (int8_t)(bfs[0] + '0');
 	bfs[1] = (int8_t)(bfs[1] + 'A');
-	bfs[2] = (int8_t)(bfs[2] + sfdsp[bfs[2] - 7]);
+	bfs[2] = sfdsp[bfs[2] - 7];
 	bfs[3] = (int8_t)(bfs[3] + '0');
 	bfs[4] = (int8_t)(bfs[4] + '0');