diff --git a/device/keller_dv2ps.cxx b/device/keller_dv2ps.cxx
index 071e758..cbe8e28 100644
--- a/device/keller_dv2ps.cxx
+++ b/device/keller_dv2ps.cxx
@@ -92,9 +92,9 @@ to be supported by the terminal server.
    structure. */
 
 typedef struct {
-    char name[NAME_LENGTH];
     char ets_in_use; /* Y = logout eds/ets/epr connection */
     char status;     /* Init, Normal, CommandErr, BusErr, DeviceErr */
+    char name[NAME_LENGTH];
 } KELLER_DV2PS_SETTINGS;
 
 #define KELLER_DV2PS_SETTINGS_STR                                              \
@@ -193,7 +193,7 @@ INT keller_dv2ps_append_crc16(char *buf) {
         // calculate 16-bit CRC
 #ifdef HANDLE_F66
         // unmask special case for crc calculation
-        if ((buf[1] == 66) && (buf[2] == (char)254))
+        if ((buf[1] == 66) && (buf[2] == 254))
             buf[2] = 0;
 #endif
         if ((retval = keller_dv2ps_calc_crc16(buf, len, &crc16_h, &crc16_l))) {
@@ -205,7 +205,7 @@ INT keller_dv2ps_append_crc16(char *buf) {
         }
 #ifdef HANDLE_F66
         if ((buf[1] == 66) && (buf[2] == 0))
-            buf[2] = (char)254; // (re)mask
+            buf[2] = 254; // (re)mask
 #endif
     } else if (buf) {
         cm_msg(MERROR, "keller_dv2ps_append_crc16",
@@ -1014,7 +1014,7 @@ send_again:
         slen = strlen(send);
 #ifdef HANDLE_F66
         // unmask special case for sending
-        if ((send[1] == 66) && (send[2] == (char)254))
+        if ((send[1] == 66) && (send[2] == 254))
             send[2] = 0;
 #endif
         // NOTE: BD_WRITES() must be used as send string may contain string
@@ -1023,7 +1023,7 @@ send_again:
 #ifdef HANDLE_F66
         // (re)mask special case
         if ((send[1] == 66) && (send[2] == 0))
-            send[2] = (char)254;
+            send[2] = 254;
 #endif
 
         ss_sleep(100); // RA36 27-JAN-2006