diff --git a/Applications/DataExplorer/DataView/NetCdfConfigureDialog.cpp b/Applications/DataExplorer/DataView/NetCdfConfigureDialog.cpp
index 1a96b736f3a2021f5f8fcb52e8c520f1c3585834..8abb1c3f75877bbbb42cd394a5d5f65f119f1f87 100644
--- a/Applications/DataExplorer/DataView/NetCdfConfigureDialog.cpp
+++ b/Applications/DataExplorer/DataView/NetCdfConfigureDialog.cpp
@@ -182,7 +182,7 @@ int NetCdfConfigureDialog::setVariableSelect()
 void NetCdfConfigureDialog::setDimensionSelect()
 {
     int const dim (_currentVar->num_dims());
-    std::array<QComboBox*,4> dim_box = { comboBoxDim1, comboBoxDim2, comboBoxDim3, comboBoxDim4 };
+    std::array<QComboBox*,4> dim_box = {{ comboBoxDim1, comboBoxDim2, comboBoxDim3, comboBoxDim4 }};
 
     for (std::size_t i=0; i<4; ++i)
     {
diff --git a/MaterialsLib/Adsorption/CMakeLists.txt b/MaterialsLib/Adsorption/CMakeLists.txt
deleted file mode 100644
index 4ff732ff0ac53b07981c3d0de37343e7ce3ee254..0000000000000000000000000000000000000000
--- a/MaterialsLib/Adsorption/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-file(GLOB Adsorption_SOURCES *.cpp)
-file(GLOB Adsorption_HEADERS *.h)
-
-add_library(MaterialsLibAdsorption ${Adsorption_HEADERS} ${Adsorption_SOURCES} )
diff --git a/MaterialsLib/CMakeLists.txt b/MaterialsLib/CMakeLists.txt
index a84584c2e41807eafe15323e67a91b9d4a6cb809..8b5fac03986501f8812853cb57d6acd7522def58 100644
--- a/MaterialsLib/CMakeLists.txt
+++ b/MaterialsLib/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Source files
-GET_SOURCE_FILES(SOURCES_MATERIALSLIB)
+GET_SOURCE_FILES(SOURCES)
+GET_SOURCE_FILES(SOURCES_ADSORPTION Adsorption)
+set(SOURCES ${SOURCES} ${SOURCES_ADSORPTION})
 
-add_subdirectory( Adsorption )
-
-add_library(MaterialsLib ${SOURCES_MATERIALSLIB} )
+add_library(MaterialsLib ${SOURCES} )
diff --git a/MaterialsLib/PhysicalConstant.cpp b/MaterialsLib/PhysicalConstant.cpp
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/ProcessLib/CMakeLists.txt b/ProcessLib/CMakeLists.txt
index 9c22324d5e36b8dc532096df09a0b424288a0abd..f60e5716d6a120f0229e5f1dd282e6eb513f68cf 100644
--- a/ProcessLib/CMakeLists.txt
+++ b/ProcessLib/CMakeLists.txt
@@ -13,7 +13,7 @@ add_library(ProcessLib ${SOURCES})
 
 target_link_libraries(ProcessLib
     AssemblerLib
-    MaterialsLibAdsorption
+    MaterialsLib
     MeshGeoToolsLib
     NumLib # for shape matrices
     ${VTK_LIBRARIES}
diff --git a/ProcessLib/TES/TESOGS5MaterialModels.h b/ProcessLib/TES/TESOGS5MaterialModels.h
index 023e4e9d6b1a7637c8bc656392e29ec31d0ef094..d7546cfc16051314d9fa0227602457bc710f4d50 100644
--- a/ProcessLib/TES/TESOGS5MaterialModels.h
+++ b/ProcessLib/TES/TESOGS5MaterialModels.h
@@ -120,7 +120,7 @@ struct FluidViscosityH2O
         H[2] = 0.6366564;
         H[3] = -0.241605;
 
-        double h[6][7] = {0.0};
+        double h[6][7] = {{0.0}};
         h[0][0] = 0.520094000;
         h[1][0] = 0.085089500;
         h[2][0] = -1.083740000;