diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8458c6937..2424344fb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1304,11 +1304,10 @@ target_link_libraries (jt9code wsjt_fort wsjt_cxx)
 
 add_executable (wsprcode lib/wsprcode/wsprcode.f90 lib/wsprcode/nhash.c
 	       wsjtx.rc)
+target_link_libraries (wsprcode wsjt_fort wsjt_cxx)
 	       
 add_executable (encode77 lib/77bit/encode77.f90 wsjtx.rc)
 target_link_libraries (encode77 wsjt_fort wsjt_cxx)
-	       
-target_link_libraries (wsprcode wsjt_fort wsjt_cxx)
 
 add_executable (wsprsim ${wsprsim_CSRCS})
 
diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index 1fe392178..83d0ef55c 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -781,8 +781,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
           SLOT(setFreq4(int,int)));
 
   decodeBusy(false);
-  QString t1[28]={"1 uW","2 uW","5 uW","10 uW","20 uW","50 uW","100 uW","200 uW","500 uW",
-                  "1 mW","2 mW","5 mW","10 mW","20 mW","50 mW","100 mW","200 mW","500 mW",
+  QString t1[19]={"1 mW","2 mW","5 mW","10 mW","20 mW","50 mW","100 mW","200 mW","500 mW",
                   "1 W","2 W","5 W","10 W","20 W","50 W","100 W","200 W","500 W","1 kW"};
 
   m_msg[0][0]=0;
@@ -792,11 +791,12 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
   ui->labNextCall->setVisible(false);
   ui->labNextCall->setToolTip("");                //### Possibly temporary ? ###
 
-  for(int i=0; i<28; i++)  {                      //Initialize dBm values
-    float dbm=(10.0*i)/3.0 - 30.0;
-    int ndbm=0;
-    if(dbm<0) ndbm=int(dbm-0.5);
-    if(dbm>=0) ndbm=int(dbm+0.5);
+  for(int i=0; i<19; i++)  {                      //Initialize dBm values
+    float dbm=(10.0*i)/3.0;
+//    int ndbm=0;
+//    if(dbm<0) ndbm=int(dbm-0.5);
+//    if(dbm>=0) ndbm=int(dbm+0.5);
+    int ndbm=int(dbm+0.5);
     QString t;
     t.sprintf("%d dBm  ",ndbm);
     t+=t1[i];