diff --git a/.gitignore b/.gitignore
index 709a1f9..7eb3d32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,4 +22,5 @@ tests/mempool_test
 wt2
 CMakeUserPresets.json
 compile_commands.json
-.cache/
\ No newline at end of file
+.cache/
+.build_success*
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ceb88c..56ceec8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -297,14 +297,12 @@ target_link_libraries(forestdb_hexamine ${PTHREAD_LIB} ${LIBM} ${SNAPPY_LIBRARIE
     ${DL_LIBRARIES} ${BREAKPAD_LIBRARIES})
 set_target_properties(forestdb_hexamine PROPERTIES COMPILE_FLAGS "-D_FDB_TOOLS")
 
-if((NOT COUCHBASE_SERVER_BUILD) OR (INSTALL_HEADER_FILES))
-    install(FILES
-        include/libforestdb/forestdb.h
-        include/libforestdb/fdb_types.h
-        include/libforestdb/fdb_errors.h
-        ${CMAKE_CURRENT_BINARY_DIR}/src/config.h
-        DESTINATION include/libforestdb)
-endif((NOT COUCHBASE_SERVER_BUILD) OR (INSTALL_HEADER_FILES))
+install(FILES
+    include/libforestdb/forestdb.h
+    include/libforestdb/fdb_types.h
+    include/libforestdb/fdb_errors.h
+    ${CMAKE_CURRENT_BINARY_DIR}/src/config.h
+    DESTINATION include/libforestdb)
 
 install(TARGETS static_lib
     RUNTIME DESTINATION bin
@@ -315,10 +313,10 @@ install(TARGETS forestdb_dump
     RUNTIME DESTINATION bin)
 
 if("${CMAKE_BUILD_TYPE}" STREQUAL "Coverage")
-    if((NOT COUCHBASE_SERVER_BUILD) AND (NOT WIN32))
+    if(NOT WIN32)
         include(cmake/Modules/CodeCoverage)
         SETUP_TARGET_FOR_COVERAGE(test_coverage ctest ${PROJECT_SOURCE_DIR}/coverage)
-    endif((NOT COUCHBASE_SERVER_BUILD) AND (NOT WIN32))
+    endif()
 endif()
 
 if(("${CMAKE_BUILD_TYPE}" STREQUAL "Valgrind") AND (NOT WIN32))
diff --git a/conanfile.py b/conanfile.py
index 53f7de6..121da49 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -49,7 +49,7 @@ def requirements(self):
 
     def layout(self):
         cmake_layout(self, generator="CMakeDeps")
-        self.cpp.package.libs = [self.name]
+        self.cpp.package.libs = [f"lib{self.name}.so" if self.options.shared else f"lib{self.name}.a"]
 
         hash = Git(self).get_commit()
         self.cpp.package.defines = self.cpp.build.defines = ["_FDB_COMMIT_HASH=%s" % hash]