diff --git a/Gui/mainwindow.cpp b/Gui/mainwindow.cpp
index c034f2797541af9a927ade4b2a3e997e654265f0..8afc7e1dfc7cffa63bf304fc00e1aea6e68088ee 100644
--- a/Gui/mainwindow.cpp
+++ b/Gui/mainwindow.cpp
@@ -1050,8 +1050,8 @@ void MainWindow::showGeoNameDialog(const std::string &geometry_name, const GeoLi
 {
 	std::string old_name = this->_geoModels->getElementNameByID(geometry_name, object_type, id);
 	SetNameDialog dlg(geometry_name, GeoLib::convertGeoTypeToString(object_type), id, old_name);
-	connect(&dlg, SIGNAL(requestNameChange(const std::string&, const GeoLib::GEOTYPE, size_t, std::string)),
-		this->_geoModels, SLOT(addNameForElement(const std::string&, const GeoLib::GEOTYPE, size_t, std::string)));
+	connect(&dlg, SIGNAL(requestNameChange(const std::string&, const GeoLib::GEOTYPE, std::size_t, std::string)),
+		this->_geoModels, SLOT(addNameForElement(const std::string&, const GeoLib::GEOTYPE, std::size_t, std::string)));
 	dlg.exec();
 
 	static_cast<GeoTreeModel*>(this->geoTabWidget->treeView->model())->setNameForItem(geometry_name, object_type,
@@ -1134,7 +1134,7 @@ void MainWindow::showVisalizationPrefsDialog()
 
 void MainWindow::FEMTestStart()
 {
-/*	
+/*
 	const double dir[3] = {0, 0, 1};
 	const MeshLib::Mesh* mesh = this->_project.getMesh("ketzin_2012_11_11_tets");
 	_meshModels->addMesh( MeshLib::MshEditor::getMeshSurface(*mesh, dir) );
diff --git a/Tests/BaseLib/TestFilePathStringManipulation.cpp b/Tests/BaseLib/TestFilePathStringManipulation.cpp
index 914d5e180f1b9c9cd02871a4e07c67f4bbdf29d6..91b141576a92e8ec6c6570f5a81fb5c0091ab291 100644
--- a/Tests/BaseLib/TestFilePathStringManipulation.cpp
+++ b/Tests/BaseLib/TestFilePathStringManipulation.cpp
@@ -13,25 +13,25 @@
 TEST(BaseLib, FindLastPathSeparatorWin)
 {
 	ASSERT_EQ ( BaseLib::findLastPathSeparator("file"), std::string::npos );
-	ASSERT_EQ ( BaseLib::findLastPathSeparator("\\file"), 0 );
-	ASSERT_EQ ( BaseLib::findLastPathSeparator("path\\"), 4 );
-	ASSERT_EQ ( BaseLib::findLastPathSeparator("\\path\\"), 5 );
-	ASSERT_EQ ( BaseLib::findLastPathSeparator("path\\file"), 4 );
-	ASSERT_EQ ( BaseLib::findLastPathSeparator("\\path\\file"), 5 );
-	ASSERT_EQ ( BaseLib::findLastPathSeparator("\\path\\path\\file"), 10 );
-	ASSERT_EQ ( BaseLib::findLastPathSeparator("\\path\\path\\path\\"), 15 );
+	ASSERT_EQ ( BaseLib::findLastPathSeparator("\\file"), 0U );
+	ASSERT_EQ ( BaseLib::findLastPathSeparator("path\\"), 4U );
+	ASSERT_EQ ( BaseLib::findLastPathSeparator("\\path\\"), 5U );
+	ASSERT_EQ ( BaseLib::findLastPathSeparator("path\\file"), 4U );
+	ASSERT_EQ ( BaseLib::findLastPathSeparator("\\path\\file"), 5U );
+	ASSERT_EQ ( BaseLib::findLastPathSeparator("\\path\\path\\file"), 10U );
+	ASSERT_EQ ( BaseLib::findLastPathSeparator("\\path\\path\\path\\"), 15U );
 }
 
 TEST(BaseLib, FindLastPathSeparatorUnix)
 {
 	ASSERT_EQ ( BaseLib::findLastPathSeparator("file"), std::string::npos );
-	ASSERT_EQ ( BaseLib::findLastPathSeparator("/file"), 0 );
-	ASSERT_EQ ( BaseLib::findLastPathSeparator("path/"), 4 );
-	ASSERT_EQ ( BaseLib::findLastPathSeparator("/path/"), 5 );
-	ASSERT_EQ ( BaseLib::findLastPathSeparator("path/file"), 4 );
-	ASSERT_EQ ( BaseLib::findLastPathSeparator("/path/file"), 5 );
-	ASSERT_EQ ( BaseLib::findLastPathSeparator("/path/path/file"), 10 );
-	ASSERT_EQ ( BaseLib::findLastPathSeparator("/path/path/path/"), 15 );
+	ASSERT_EQ ( BaseLib::findLastPathSeparator("/file"), 0U );
+	ASSERT_EQ ( BaseLib::findLastPathSeparator("path/"), 4U );
+	ASSERT_EQ ( BaseLib::findLastPathSeparator("/path/"), 5U );
+	ASSERT_EQ ( BaseLib::findLastPathSeparator("path/file"), 4U );
+	ASSERT_EQ ( BaseLib::findLastPathSeparator("/path/file"), 5U );
+	ASSERT_EQ ( BaseLib::findLastPathSeparator("/path/path/file"), 10U );
+	ASSERT_EQ ( BaseLib::findLastPathSeparator("/path/path/path/"), 15U );
 }
 
 TEST(BaseLib, DropFileExtensionWin)
diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake
index 1dd0fc163399594c611306a8e41632d8af88965c..1f2fd56c5b52ba806ff7efbe700b0efa644c901f 100644
--- a/scripts/cmake/Find.cmake
+++ b/scripts/cmake/Find.cmake
@@ -32,6 +32,14 @@ FIND_PACKAGE(GitHub)
 # Find bash itself ...
 FIND_PROGRAM(BASH_TOOL_PATH bash
 	HINTS ${GITHUB_BIN_DIR} DOC "The bash executable")
+
+# Dumpbin is a windows dependency analaysis tool required for packaging
+IF(WIN32 AND OGS_PACKAGING)
+	FIND_PROGRAM(DUMPBIN_TOOL_PATH dumpbin DOC "Windows dependency analysis tool")
+	IF(NOT DUMPBIN_TOOL_PATH)
+		MESSAGE(FATAL_ERROR "Dumpbin was not found but is required for packaging!")
+	ENDIF()
+ENDIF()
 ######################
 ### Find libraries ###
 ######################