diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fcf7c17dc..40bda7aad 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -53,6 +53,8 @@ endif()
 add_subdirectory(slic3r)
 
 # Create a slic3r executable
+#FIXME add Windows resource file
+#add_executable(slic3r slic3r.cpp slic3r.rc)
 add_executable(slic3r slic3r.cpp)
 if(SLIC3R_GUI)
     set_target_properties(slic3r PROPERTIES OUTPUT_NAME "slic3r-gui")
@@ -71,7 +73,7 @@ endif ()
 
 # Add the Slic3r GUI library, libcurl, OpenGL and GLU libraries.
 if (SLIC3R_GUI)
-    target_link_libraries(slic3r libslic3r_gui ${wxWidgets_LIBRARIES} ${CURL_LIBRARIES})
+    target_link_libraries(slic3r libslic3r_gui ${wxWidgets_LIBRARIES})
 
     # Configure libcurl & OpenSSL
     find_package(CURL REQUIRED)
diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
index 6955dd1e7..16b70a8da 100644
--- a/src/libslic3r/CMakeLists.txt
+++ b/src/libslic3r/CMakeLists.txt
@@ -165,7 +165,6 @@ target_link_libraries(libslic3r
     qhull
     semver
     ${TBB_LIBRARIES} 
-#    ${wxWidgets_LIBRARIES}
     )
 
 if(SLIC3R_PROFILE)
diff --git a/src/libslic3r/Layer.cpp b/src/libslic3r/Layer.cpp
index 6c2bd0da9..afdde1852 100644
--- a/src/libslic3r/Layer.cpp
+++ b/src/libslic3r/Layer.cpp
@@ -154,7 +154,7 @@ void Layer::make_fills()
         layerm->fills.clear();
         make_fill(*layerm, layerm->fills);
 #ifndef NDEBUG
-        for (size_t i = 0; i < layerm.fills.entities.size(); ++ i)
+        for (size_t i = 0; i < layerm->fills.entities.size(); ++ i)
             assert(dynamic_cast<ExtrusionEntityCollection*>(layerm->fills.entities[i]) != NULL);
 #endif
     }
diff --git a/xs/CMakeLists.txt b/xs/CMakeLists.txt
index 4ea8bb4d2..9a08beadc 100644
--- a/xs/CMakeLists.txt
+++ b/xs/CMakeLists.txt
@@ -117,23 +117,15 @@ if(APPLE)
     # Ignore undefined symbols of the perl interpreter, they will be found in the caller image.
     target_link_libraries(XS "-undefined dynamic_lookup")
 endif()
-target_link_libraries(XS libslic3r admesh miniz clipper nowide polypartition poly2tri semver avrdude qhull)
-if(SLIC3R_PROFILE)
-    target_link_libraries(XS Shiny)
-endif()
+target_link_libraries(XS libslic3r)
 
 target_include_directories(XS PRIVATE src)
 target_compile_definitions(XS PRIVATE -DSLIC3RXS)
 set_target_properties(XS PROPERTIES PREFIX "") # Prevent cmake from generating libXS.so instead of XS.so
 
 target_link_libraries(XS ${Boost_LIBRARIES})
-# target_link_libraries(XS ${wxWidgets_LIBRARIES})
-# target_link_libraries(XS ${CURL_LIBRARIES})
-# target_link_libraries(XS ${OPENSSL_LIBRARIES})
 
 if (APPLE)
-#    add_compile_options(-stdlib=libc++)
-#    add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
     # -liconv: boost links to libiconv by default
     target_link_libraries(XS "-liconv -framework IOKit" "-framework CoreFoundation" -lc++)
 elseif (MSVC)