diff --git a/src/libigl/CMakeLists.txt b/src/libigl/CMakeLists.txt
index 0852fad72..3daac757b 100644
--- a/src/libigl/CMakeLists.txt
+++ b/src/libigl/CMakeLists.txt
@@ -10,5 +10,5 @@ if(libigl_FOUND)
     target_link_libraries(libigl INTERFACE igl::core)
 else()
     message(STATUS "IGL NOT found, using bundled version...")
-    target_include_directories(libigl INTERFACE SYSTEM ${LIBDIR}/libigl)
+    target_include_directories(libigl SYSTEM BEFORE INTERFACE ${LIBDIR}/libigl)
 endif()
diff --git a/src/libslic3r/Model.cpp b/src/libslic3r/Model.cpp
index 596f80671..9d68f7141 100644
--- a/src/libslic3r/Model.cpp
+++ b/src/libslic3r/Model.cpp
@@ -1564,8 +1564,10 @@ void ModelVolume::center_geometry_after_creation()
     Vec3d shift = this->mesh().bounding_box().center();
     if (!shift.isApprox(Vec3d::Zero()))
     {
-        m_mesh->translate(-(float)shift(0), -(float)shift(1), -(float)shift(2));
-        m_convex_hull->translate(-(float)shift(0), -(float)shift(1), -(float)shift(2));
+    	if (m_mesh)
+        	m_mesh->translate(-(float)shift(0), -(float)shift(1), -(float)shift(2));
+        if (m_convex_hull)
+        	m_convex_hull->translate(-(float)shift(0), -(float)shift(1), -(float)shift(2));
         translate(shift);
     }
 }
diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp
index d7d1a1af7..e926dcf97 100644
--- a/src/slic3r/GUI/GUI_ObjectList.cpp
+++ b/src/slic3r/GUI/GUI_ObjectList.cpp
@@ -460,7 +460,7 @@ void ObjectList::update_extruder_in_config(const wxDataViewItem& item)
     if (!m_config || selection.empty())
         return;
 
-    const int extruder = selection.size() > 1 ? 0 : atoi(selection.c_str());
+    const int extruder = /*selection.size() > 1 ? 0 : */atoi(selection.c_str());
     m_config->set_key_value("extruder", new ConfigOptionInt(extruder));
 
     // update scene