diff --git a/ActiveRecord/CMakeLists.txt b/ActiveRecord/CMakeLists.txt
index 9c2e67f2a..ad39171e7 100644
--- a/ActiveRecord/CMakeLists.txt
+++ b/ActiveRecord/CMakeLists.txt
@@ -18,7 +18,7 @@ set_target_properties(ActiveRecord
 	PROPERTIES
 	VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION}
 	OUTPUT_NAME PocoActiveRecord
-	DEFINE_SYMBOL ActiveRecord_EXPORTS
+	DEFINE_SYMBOL ActiveRecordLib_EXPORTS
 )
 
 target_link_libraries(ActiveRecord PUBLIC Poco::Data Poco::Foundation)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 198df464c..73b444d12 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -134,11 +134,11 @@ else()
 endif()
 
 if(PostgreSQL_FOUND)
-	option(ENABLE_DATA "Enable SQL" ON)
-	option(ENABLE_DATA_POSTGRESQL "Enable SQL PosgreSQL" ON)
+	option(ENABLE_DATA "Enable Data" ON)
+	option(ENABLE_DATA_POSTGRESQL "Enable Data PosgreSQL" ON)
 else()
-	option(ENABLE_DATA "Enable SQL" OFF)
-	option(ENABLE_DATA_POSTGRESQL "Enable SQL PosgreSQL" OFF)
+	option(ENABLE_DATA "Enable Data" OFF)
+	option(ENABLE_DATA_POSTGRESQL "Enable Data PosgreSQL" OFF)
 endif()
 
 if(ENABLE_DATA_ODBC)
@@ -175,12 +175,11 @@ option(ENABLE_POCODOC "Enable Poco Documentation Generator" OFF)
 option(ENABLE_PAGECOMPILER "Enable PageCompiler" ON)
 option(ENABLE_PAGECOMPILER_FILE2PAGE "Enable File2Page" ON)
 
-if(ENABLE_DATA)
-	option(ENABLE_ACTIVERECORD "Enable ActiveRecord" ON)
-	option(ENABLE_ACTIVERECORD_COMPILER "Enable ActiveRecord Compiler" ON)
-else()
-	option(ENABLE_ACTIVERECORD "Enable ActiveRecord" OFF)
-	option(ENABLE_ACTIVERECORD_COMPILER "Enable ActiveRecord Compiler" OFF)
+option(ENABLE_ACTIVERECORD "Enable ActiveRecord" ON)
+option(ENABLE_ACTIVERECORD_COMPILER "Enable ActiveRecord Compiler" ON)
+
+if(ENABLE_ACTIVERECORD AND NOT ENABLE_DATA)
+  set(ENABLE_DATA ON CACHE BOOL "Enable Data" FORCE)
 endif()
 
 option(ENABLE_TESTS
@@ -248,6 +247,9 @@ if(ENABLE_DATA AND ENABLE_TESTS)
 	set(ENABLE_DATA_SQLITE ON CACHE BOOL "Enable Data SQlite" FORCE)
 endif()
 
+if(ENABLE_ACTIVERECORD AND ENABLE_TESTS)
+	set(ENABLE_DATA_SQLITE ON CACHE BOOL "Enable Data SQlite" FORCE)
+endif()
 if(ENABLE_NETSSL_WIN)
 	set(ENABLE_UTIL ON CACHE BOOL "Enable Util" FORCE)
 	if(ENABLE_TESTS)
@@ -335,16 +337,6 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/Redis AND ENABLE_REDIS)
 	list(APPEND Poco_COMPONENTS "Redis")
 endif()
 
-if(EXISTS ${PROJECT_SOURCE_DIR}/ActiveRecord AND ENABLE_ACTIVERECORD)
-	add_subdirectory(ActiveRecord)
-	list(APPEND Poco_COMPONENTS "ActiveRecord")
-endif()
-
-if(EXISTS ${PROJECT_SOURCE_DIR}/ActiveRecord/Compiler AND ENABLE_ACTIVERECORD_COMPILER)
-	add_subdirectory(ActiveRecord/Compiler)
-	list(APPEND Poco_COMPONENTS "ActiveRecordCompiler")
-endif()
-
 if(EXISTS ${PROJECT_SOURCE_DIR}/PDF AND ENABLE_PDF)
 	add_subdirectory(PDF)
 	list(APPEND Poco_COMPONENTS "PDF")
@@ -379,6 +371,16 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/Data AND ENABLE_DATA)
 	list(APPEND Poco_COMPONENTS "Data")
 endif()
 
+if(EXISTS ${PROJECT_SOURCE_DIR}/ActiveRecord AND ENABLE_ACTIVERECORD)
+	add_subdirectory(ActiveRecord)
+	list(APPEND Poco_COMPONENTS "ActiveRecord")
+endif()
+
+if(EXISTS ${PROJECT_SOURCE_DIR}/ActiveRecord/Compiler AND ENABLE_ACTIVERECORD_COMPILER)
+	add_subdirectory(ActiveRecord/Compiler)
+	list(APPEND Poco_COMPONENTS "ActiveRecordCompiler")
+endif()
+
 if(EXISTS ${PROJECT_SOURCE_DIR}/SevenZip AND ENABLE_SEVENZIP)
 	add_subdirectory(SevenZip)
 	list(APPEND Poco_COMPONENTS "SevenZip")
@@ -495,7 +497,7 @@ message(STATUS "[cmake] Installation target path: ${CMAKE_INSTALL_PREFIX}")
 if(CMAKE_TOOLCHAIN_FILE)
 	message(STATUS "[cmake] Use toolchain file:		${CMAKE_TOOLCHAIN_FILE}")
 endif()
-message(STATUS "[cmake] Bulid for OS type:		${CMAKE_SYSTEM_NAME}")
+message(STATUS "[cmake] Build for OS type:		${CMAKE_SYSTEM_NAME}")
 message(STATUS "[cmake] Build for OS version:	${CMAKE_SYSTEM_VERSION}")
 message(STATUS "[cmake] Build for CPU type:		${CMAKE_SYSTEM_PROCESSOR}")
 message(STATUS "[cmake] Build type:				${CMAKE_BUILD_TYPE}")
diff --git a/DLLVersion.rc b/DLLVersion.rc
index d3afb2c6a..46f1d9b3a 100644
--- a/DLLVersion.rc
+++ b/DLLVersion.rc
@@ -29,7 +29,7 @@ BEGIN
             VALUE "FileVersion", POCO_VERSION_STR
             VALUE "InternalName", "POCO"
             VALUE "LegalCopyright", "Copyright (C) 2004-2021, Applied Informatics Software Engineering GmbH and Contributors."
-            VALUE "ProductName", "POCO C++ Libraries - http://pocoproject.org"
+            VALUE "ProductName", "POCO C++ Libraries - https://pocoproject.org"
             VALUE "ProductVersion", POCO_VERSION_STR
         END
     END