diff --git a/src/lib/settings/LanguageType.cpp b/src/lib/settings/LanguageType.cpp
index 2995f2e2..01bb7365 100644
--- a/src/lib/settings/LanguageType.cpp
+++ b/src/lib/settings/LanguageType.cpp
@@ -67,5 +67,7 @@ LanguageType getLanguageTypeForProjectType(ProjectType t)
 	default:
 		break;
 	}
+
+	return LANGUAGE_UNKNOWN;
 }
 
diff --git a/src/lib/utility/interprocess/SharedUUIDManager.cpp b/src/lib/utility/interprocess/SharedUUIDManager.cpp
index c2345fbc..a5f487b8 100644
--- a/src/lib/utility/interprocess/SharedUUIDManager.cpp
+++ b/src/lib/utility/interprocess/SharedUUIDManager.cpp
@@ -88,9 +88,7 @@ void SharedUUIDManager::removeInstanceUUID(const std::string& instanceUUID)
 	m_uuids->getValues(m_instanceUUIDsKey, instanceUUIDs);
 
 	// instanceUUIDs
-
-	std::vector<std::string>::iterator it = instanceUUIDs.begin();
-	for (it; it != instanceUUIDs.end(); it++)
+	for (std::vector<std::string>::iterator it = instanceUUIDs.begin(); it != instanceUUIDs.end(); it++)
 	{
 		if (*it == instanceUUID)
 		{
diff --git a/src/lib/utility/utilityString.cpp b/src/lib/utility/utilityString.cpp
index eaa06eaa..3ae750b1 100644
--- a/src/lib/utility/utilityString.cpp
+++ b/src/lib/utility/utilityString.cpp
@@ -211,7 +211,7 @@ namespace utility
 		return str;
 	}
 
-	std::string insertLineBreaksAtBlankSpaces(const std::string& s, int maxLineLength)
+	std::string insertLineBreaksAtBlankSpaces(const std::string& s, size_t maxLineLength)
 	{
 		const std::vector<std::string> atoms = splitToVector(s, " ");
 
diff --git a/src/lib/utility/utilityString.h b/src/lib/utility/utilityString.h
index a4635b13..67d969ba 100644
--- a/src/lib/utility/utilityString.h
+++ b/src/lib/utility/utilityString.h
@@ -45,7 +45,7 @@ namespace utility
 
 	std::string replace(std::string str, const std::string& from, const std::string& to);
 
-	std::string insertLineBreaksAtBlankSpaces(const std::string& s, int maxLineLength);
+	std::string insertLineBreaksAtBlankSpaces(const std::string& s, size_t maxLineLength);
 
 	std::string trim(const std::string &str);
 
diff --git a/src/lib/utility/utilityXml.cpp b/src/lib/utility/utilityXml.cpp
index 711b065f..1d44c99b 100644
--- a/src/lib/utility/utilityXml.cpp
+++ b/src/lib/utility/utilityXml.cpp
@@ -1,6 +1,6 @@
-#include "utility/utilityXml.h";
+#include "utility/utilityXml.h"
 
-#include "tinyxml/tinyxml.h";
+#include "tinyxml/tinyxml.h"
 
 namespace utility
 {
diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentBuildFile.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentBuildFile.cpp
index 0764f769..c0d14504 100644
--- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentBuildFile.cpp
+++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentBuildFile.cpp
@@ -40,6 +40,8 @@ void QtProjectWizzardContentBuildFile::populate(QGridLayout* layout, int& row)
 		name = "Compilation Database";
 		filter = "JSON Compilation Database (*.json)";
 		break;
+	default:
+		return;
 	}
 
 	QLabel* label = createFormLabel(name);
@@ -68,6 +70,8 @@ void QtProjectWizzardContentBuildFile::load()
 		case PROJECT_CXX_CDB:
 			m_picker->setText(QString::fromStdString(cxxSettings->getCompilationDatabasePath().str()));
 			break;
+		default:
+			return;
 		}
 	}
 }
@@ -94,6 +98,8 @@ void QtProjectWizzardContentBuildFile::save()
 				cxxSettings->setCompilationDatabasePath(path);
 				break;
 			}
+		default:
+			return;
 		}
 	}
 }
@@ -118,6 +124,8 @@ bool QtProjectWizzardContentBuildFile::check()
 				return false;
 			}
 		}
+	default:
+		break;
 	}
 
 	return true;