diff --git a/src/core/net/private/geoipdatabase.cpp b/src/core/net/private/geoipdatabase.cpp
index a8d886c7e..3c8ed6cce 100644
--- a/src/core/net/private/geoipdatabase.cpp
+++ b/src/core/net/private/geoipdatabase.cpp
@@ -392,6 +392,8 @@ QVariant GeoIPDatabase::readDataField(quint32 &offset) const
         else
             qDebug() << "* Invalid field size for type: Float";
         break;
+    default:
+        qDebug() << "* Unsupported data type: Unknown";
     }
 
     if (!usePointer)
diff --git a/src/gui/properties/propertieswidget.cpp b/src/gui/properties/propertieswidget.cpp
index 5d6f7adc0..49ff7e1d4 100644
--- a/src/gui/properties/propertieswidget.cpp
+++ b/src/gui/properties/propertieswidget.cpp
@@ -453,19 +453,19 @@ void PropertiesWidget::loadDynamicData() {
         	showPiecesAvailability(false);
         }
 
-        return;
+        break;
     }
 
     case PropTabBar::TRACKERS_TAB: {
         // Trackers
         trackerList->loadTrackers();
-        return;
+        break;
     }
 
     case PropTabBar::PEERS_TAB: {
         // Load peers
         peersList->loadPeers(m_torrent);
-        return;
+        break;
     }
 
     case PropTabBar::FILES_TAB: {
@@ -480,10 +480,10 @@ void PropertiesWidget::loadDynamicData() {
             // PropListModel->model()->updateFilesPriorities(h.file_priorities());
             filesList->setUpdatesEnabled(true);
         }
+        break;
     }
 
-    default:
-          return;
+    default:;
     }
 }