diff --git a/Configuration.cpp b/Configuration.cpp
index 3b03490ee..3443043c8 100644
--- a/Configuration.cpp
+++ b/Configuration.cpp
@@ -1202,27 +1202,7 @@ void Configuration::impl::initialize_models ()
   ui_->single_decode_check_box->setChecked(single_decode_);
   ui_->cbTwoPass->setChecked(twoPass_);
   ui_->gbSpecialOpActivity->setChecked(bSpecialOp_);
-  switch(SelectedActivity_)
-    {
-      case 1:
-        ui_->rbNA_VHF_Contest->setChecked(true);
-        break;
-      case 2:
-        ui_->rbEU_VHF_Contest->setChecked(true);
-        break;
-      case 3:
-        ui_->rbField_Day->setChecked(true);
-        break;
-      case 4:
-        ui_->rbRTTY_Roundup->setChecked(true);
-        break;
-      case 5:
-        ui_->rbRTTY_Roundup->setChecked(true);
-        break;
-      case 6:
-        ui_->rbRTTY_Roundup->setChecked(true);
-        break;
-    } 
+  ui_->special_op_activity_button_group->button (SelectedActivity_)->setChecked (true);
   ui_->cbx2ToneSpacing->setChecked(x2ToneSpacing_);
   ui_->cbx4ToneSpacing->setChecked(x4ToneSpacing_);
   ui_->type_2_msg_gen_combo_box->setCurrentIndex (type_2_msg_gen_);
diff --git a/logqso.cpp b/logqso.cpp
index c3931422e..4784848d1 100644
--- a/logqso.cpp
+++ b/logqso.cpp
@@ -60,7 +60,6 @@ void LogQSO::initLogQSO(QString const& hisCall, QString const& hisGrid, QString
                         Radio::Frequency dialFreq, bool noSuffix, QString xSent, QString xRcvd)
 {
   if(!isHidden()) return;
-  m_nContest = static_cast<qint32> (m_config->special_op_id());
   m_xSent=xSent;
   m_xRcvd=xRcvd;
   ui->call->setText(hisCall);
diff --git a/logqso.h b/logqso.h
index 13d4f2c82..2f2e4c29e 100644
--- a/logqso.h
+++ b/logqso.h
@@ -58,7 +58,6 @@ private:
   QString m_myGrid;
   QString m_xSent;
   QString m_xRcvd;
-  qint32  m_nContest;
   QDateTime m_dateTimeOn;
   QDateTime m_dateTimeOff;
 };
diff --git a/mainwindow.cpp b/mainwindow.cpp
index fdaccdf77..1f8f8d522 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1179,7 +1179,7 @@ void MainWindow::readSettings()
 
 void MainWindow::checkMSK144ContestType()
 {
-  if(SpecOp::NONE < m_config.special_op_id()) 
+  if(SpecOp::NONE != m_config.special_op_id()) 
     {
       if(m_mode=="MSK144" && SpecOp::EU_VHF < m_config.special_op_id())
         {
@@ -5259,7 +5259,7 @@ void MainWindow::on_logQSOButton_clicked()                 //Log QSO button
       default: break;
     }
 
-  if(m_config.special_op_id()>SpecOp::NONE and SpecOp::FOX > m_config.special_op_id()) {
+  if(SpecOp::NONE < m_config.special_op_id() and SpecOp::FOX > m_config.special_op_id()) {
     int n=ui->sbSerialNumber->value();
     ui->sbSerialNumber->setValue(n+1);
     cabLog();   //Call the Cabrillo contest logger