diff --git a/Audio/BWFFile.cpp b/Audio/BWFFile.cpp
index 61e302f90..78d6a79f9 100644
--- a/Audio/BWFFile.cpp
+++ b/Audio/BWFFile.cpp
@@ -354,6 +354,7 @@ bool BWFFile::impl::update_header ()
             {
             case BextVersion::v_0:
               data->version_ = qToBigEndian<quint32> (data->version_);
+              // fall through
             default:
               data->loudness_value_ = qToBigEndian<quint16> (data->loudness_value_);
               data->loudness_range_ = qToBigEndian<quint16> (data->loudness_range_);
@@ -370,6 +371,7 @@ bool BWFFile::impl::update_header ()
             {
             case BextVersion::v_0:
               data->version_ = qToLittleEndian<quint32> (data->version_);
+              // fall through
             default:
               data->loudness_value_ = qToLittleEndian<quint16> (data->loudness_value_);
               data->loudness_range_ = qToLittleEndian<quint16> (data->loudness_range_);
diff --git a/Network/NetworkServerLookup.cpp b/Network/NetworkServerLookup.cpp
index 3e0ec34a3..0d7cd4fe6 100644
--- a/Network/NetworkServerLookup.cpp
+++ b/Network/NetworkServerLookup.cpp
@@ -66,8 +66,7 @@ network_server_lookup (QString query
                 {
                   break;
                 }
-              // drop through
-
+              // fall through
             case QAbstractSocket::AnyIPProtocol:
               found = true;
               break;
diff --git a/getfile.cpp b/getfile.cpp
index ed227dd38..96c76ad8a 100644
--- a/getfile.cpp
+++ b/getfile.cpp
@@ -22,21 +22,21 @@
 
 void getfile(QString fname, int ntrperiod)
 {
-  struct WAVHDR {
-    char ariff[4];
-    int lenfile;
-    char awave[4];
-    char afmt[4];
-    int lenfmt;
-    short nfmt2;
-    short nchan2;
-    int nsamrate;
-    int nbytesec;
-    short nbytesam2;
-    short nbitsam2;
-    char adata[4];
-    int ndata;
-  } hdr;
+  // struct WAVHDR {
+  //   char ariff[4];
+  //   int lenfile;
+  //   char awave[4];
+  //   char afmt[4];
+  //   int lenfmt;
+  //   short nfmt2;
+  //   short nchan2;
+  //   int nsamrate;
+  //   int nbytesec;
+  //   short nbytesam2;
+  //   short nbitsam2;
+  //   char adata[4];
+  //   int ndata;
+  // } hdr;
 
   char name[512];
   strncpy(name,fname.toLatin1(), sizeof (name) - 1);
@@ -93,10 +93,10 @@ void getfile(QString fname, int ntrperiod)
         if (!memcmp(desc.id,"data",sizeof desc.id)) break;
       } while (!fseek(fp,(desc.size + 1) / 2 * 2,SEEK_CUR));
     
-// Read (and ignore) a 44-byte WAV header; then read data
-//    int n=fread(&hdr,1,44,fp);
+    // Read (and ignore) a 44-byte WAV header; then read data
+    // int n=fread(&hdr,1,44,fp);
     int n=fread(dec_data.d2,2,npts,fp);
-    if(hdr.nsamrate==11025) wav12_(dec_data.d2,dec_data.d2,&n,(short*)&fmt.nbitsam2);
+    if(fmt.nsamrate==11025) wav12_(dec_data.d2,dec_data.d2,&n,(short*)&fmt.nbitsam2);
     fclose(fp);
     dec_data.params.newdat=1;
     dec_data.params.kin=n;
diff --git a/widgets/RestrictedSpinBox.cpp b/widgets/RestrictedSpinBox.cpp
index 3d18ce488..0c71634bb 100644
--- a/widgets/RestrictedSpinBox.cpp
+++ b/widgets/RestrictedSpinBox.cpp
@@ -10,7 +10,7 @@ QValidator::State RestrictedSpinBox::validate (QString& input, int& pos) const
   // start by doing the standard QSpinBox validation
   auto valid = HintedSpinBox::validate (input, pos);
   // extra validation
-  if (QValidator::Acceptable
+  if (QValidator::Acceptable == valid
       && values ().end () == std::find (values ().begin (), values ().end (), valueFromText (input)))
     {
       valid = QValidator::Intermediate;