diff --git a/ChangeLog b/ChangeLog
index 9729965..93a6ec2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@ Key:
 v.0.5dev (ongoing development)
  + sed1330 driver: Add support for HG25504 (L. Lagendijk)
  * Build system: Fix xosd detection
+ * Reset ccmode on screen clear for NoritakeVFD, tyan driver
 
 v0.5.4
  * Update driver includes and LDFLAGS (fixed glk and bayrad binding error)
diff --git a/server/drivers/NoritakeVFD.c b/server/drivers/NoritakeVFD.c
index a28c27c..4f93909 100644
--- a/server/drivers/NoritakeVFD.c
+++ b/server/drivers/NoritakeVFD.c
@@ -387,6 +387,7 @@ NoritakeVFD_clear (Driver *drvthis)
 	PrivateData *p = drvthis->private_data;
 
 	memset(p->framebuf, ' ', p->width * p->height);
+	p->ccmode = standard;
 }
 
 
diff --git a/server/drivers/serialPOS.c b/server/drivers/serialPOS.c
index b0e39f2..05e5ed1 100644
--- a/server/drivers/serialPOS.c
+++ b/server/drivers/serialPOS.c
@@ -132,17 +132,6 @@ typedef enum {
 } AEDEXCommands;
 
 
-typedef enum {
-	standard,	/* only char 0 is used for heartbeat */
-	vbar,		/* vertical bars */
-	hbar,		/* horizontal bars */
-	custom,		/* custom settings */
-	bignum,		/* big numbers */
-	bigchar		/* big characters */
-} CGmode;
-
-
-
 /** private data for the \c serialPOS driver */
 typedef struct serialPOS_private_data {
 	int fd;			/**< LCD file descriptor */
@@ -155,9 +144,6 @@ typedef struct serialPOS_private_data {
 	unsigned char *framebuf;
 	unsigned char *backingstore;
 
-	/* defineable characters */
-	CGmode ccmode;
-
 	/* feature enable */
 	int hardwrap;
 	int hardscroll;
diff --git a/server/drivers/tyan_lcdm.c b/server/drivers/tyan_lcdm.c
index 64a1c0e..7afe053 100644
--- a/server/drivers/tyan_lcdm.c
+++ b/server/drivers/tyan_lcdm.c
@@ -307,26 +307,30 @@ tyan_lcdm_get_key (Driver *drvthis)
 	switch (key) {
 		case TYAN_LCDM_KEY_LEFT:
 			return "Left";
-			break;
+			/* NOTREACHED */
 		case TYAN_LCDM_KEY_UP:
 			return "Up";
-			break;
+			/* NOTREACHED */
 		case TYAN_LCDM_KEY_DOWN:
 			return "Down";
-			break;
+			/* NOTREACHED */
 		case TYAN_LCDM_KEY_RIGHT:
 			return "Right";
-			break;
+			/* NOTREACHED */
 		case TYAN_LCDM_KEY_ENTER:
 			return "Enter";
-			break;
+			/* NOTREACHED */
 		case TYAN_LCDM_KEY_ESCAPE:
 			return "Escape";
-			break;
+			/* NOTREACHED */
+		case 0xF4:
+			report(RPT_WARNING, "%s: Error while reading key", drvthis->name);
+			return NULL;
+			/* NOTREACHED */
 		default:
 			report(RPT_INFO, "%s: Untreated key 0x%02X", drvthis->name, key);
 			return NULL;
-			break;
+			/* NOTREACHED */
 	}
 }
 
@@ -701,6 +705,7 @@ tyan_lcdm_clear (Driver *drvthis)
 	PrivateData *p = drvthis->private_data;
 
 	memset(p->framebuf, ' ', p->width * p->height);
+	p->ccmode = standard;
 }