--- np2/generic/keydisp.c	2003/11/21 06:51:11	1.1
+++ np2/generic/keydisp.c	2004/01/23 15:05:04	1.5
@@ -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] = (*(WORD *)(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;
@@ -917,7 +917,7 @@ void keydisp_getsize(int *width, int *he
 	if (width) {
 		*width = KEYDISP_WIDTH;
 	}
-	if (*height) {
+	if (height) {
 		*height = (getdispkeys() * KEYDISP_KEYCY) + 1;
 	}
 	keydisp.dispflag &= ~KEYDISP_FLAGSIZING;