--- np2/generic/keydisp.c	2003/11/28 15:28:19	1.3
+++ np2/generic/keydisp.c	2004/01/27 15:38:20	1.6
@@ -409,7 +409,7 @@ static void psgmix(BYTE ch, PSGGEN psg) 
 			}
 			else if ((!(k->mix & bit)) && (psg->reg.vol[i] & 0x1f)) {
 				k->flag |= bit;
-				k->fto[i] = (*(UINT16 *)(psg->reg.tune[i])) & 0xfff;
+				k->fto[i] = LOADINTELWORD(psg->reg.tune[i]) & 0xfff;
 				k->lastnote[i] = getpsgnote(k->fto[i]);
 				delaysetevent(pos, (BYTE)(k->lastnote[i] | 0x80));
 			}
@@ -540,7 +540,7 @@ static void setpsghdl(BYTE items) {
 	}
 }
 
-void keydisp_setfmboard(BYTE b) {
+void keydisp_setfmboard(UINT b) {
 
 	keydisp.keymax = 0;
 	keydisp.fmmax = 0;
@@ -721,7 +721,9 @@ static BOOL draw1key(CMNVRAM *vram, KDCH
 
 	KDKEYPOS	*pos;
 	UINT		pal;
+#if defined(SUPPORT_8BPP)
 	BYTE		pal8;
+#endif
 
 	pos = keydisp.keypos + (kdch->k[n] & 0x7f);
 	pal = kdch->r[n] & 0x7f;