diff --git a/lib/ft4/ft4code.f90 b/lib/ft4/ft4code.f90
index a7b2ccdd2..dae552450 100644
--- a/lib/ft4/ft4code.f90
+++ b/lib/ft4/ft4code.f90
@@ -65,7 +65,8 @@ program ft4code
      if(i3.eq.2) msgtype="EU VHF Contest"
      if(i3.eq.3) msgtype="ARRL RTTY Roundup"
      if(i3.eq.4) msgtype="Nonstandard calls"
-     if(i3.ge.5) msgtype="Undefined msg type"
+     if(i3.eq.5) msgtype="EU VHF Contest"
+     if(i3.ge.6) msgtype="Undefined msg type"
      if(i3.ge.1) n3=-1
      bad=" "
      comment='         '
diff --git a/lib/ft8/ft8code.f90 b/lib/ft8/ft8code.f90
index 8d5b52799..219fd2e3d 100644
--- a/lib/ft8/ft8code.f90
+++ b/lib/ft8/ft8code.f90
@@ -64,7 +64,8 @@ program ft8code
      if(i3.eq.2) msgtype="EU VHF Contest"
      if(i3.eq.3) msgtype="ARRL RTTY Roundup"
      if(i3.eq.4) msgtype="Nonstandard call"
-     if(i3.ge.5) msgtype="Undefined type"
+     if(i3.eq.5) msgtype="EU VHF Contest"
+     if(i3.ge.6) msgtype="Undefined type"
      if(i3.ge.1) n3=-1
      bad=" "
      comment='         '
diff --git a/lib/msk144code.f90 b/lib/msk144code.f90
index e75ebf3d3..2cb4d6a4d 100644
--- a/lib/msk144code.f90
+++ b/lib/msk144code.f90
@@ -51,7 +51,8 @@ program msk144code
      if(i3.eq.2) msgtype="EU VHF Contest"
      if(i3.eq.3) msgtype="ARRL RTTY Roundup"
      if(i3.eq.4) msgtype="Nonstandard calls"
-     if(i3.ge.5) msgtype="Undefined msg type"
+     if(i3.eq.5) msgtype="EU VHF Contest"
+     if(i3.ge.6) msgtype="Undefined msg type"
      if(i3.ge.1) n3=-1
      if(i4tone(41).lt.0) then
         msgtype="Sh msg"
diff --git a/lib/msk144decodeframe.f90 b/lib/msk144decodeframe.f90
index 24119b9bd..b8bdba28c 100644
--- a/lib/msk144decodeframe.f90
+++ b/lib/msk144decodeframe.f90
@@ -100,7 +100,7 @@ subroutine msk144decodeframe(c,softbits,msgreceived,nsuccess)
     nsuccess=1
     write(c77,'(77i1)') decoded77
     read(c77(72:77),'(2b3)') n3,i3
-    if( (i3.eq.0.and.(n3.eq.1 .or. n3.eq.3 .or. n3.eq.4 .or. n3.gt.5)) .or. i3.eq.3 .or. i3.gt.4 ) then
+    if( (i3.eq.0.and.(n3.eq.1 .or. n3.eq.3 .or. n3.eq.4 .or. n3.gt.5)) .or. i3.eq.3 .or. i3.gt.5 ) then
         nsuccess=0 
     else 
         call unpack77(c77,1,msgreceived,unpk77_success)
diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index 6cd747d76..581b0d4f2 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -5718,7 +5718,7 @@ void MainWindow::msgtype(QString t, QLineEdit* tx)               //msgtype()
       p.setColor(QPalette::Base,"#66ffff");     //light blue
     } else {
       p.setColor(QPalette::Base,Qt::transparent);
-      if(m_mode=="MSK144" and t.mid(0,1)=="<") {
+      if ("MSK144" == m_mode && t.count ('<') == 1) {
         p.setColor(QPalette::Base,"#00ffff");   //another light blue
       }
     }