diff --git a/contrib/libuv-cmake/CMakeLists.txt b/contrib/libuv-cmake/CMakeLists.txt
index a2869e037ff0b1e579468ec0255f85d4e81a9887..65aeabdd9cb3e50148b132b75f5eea2427650164 100644
--- a/contrib/libuv-cmake/CMakeLists.txt
+++ b/contrib/libuv-cmake/CMakeLists.txt
@@ -227,7 +227,11 @@ set(uv_test_sources
 #  list(APPEND uv_test_libraries ws2_32)
 #  list(APPEND uv_test_sources src/win/snprintf.c test/runner-win.c)
 #else()
-list(APPEND uv_defines _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE)
+
+if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+  list(APPEND uv_defines _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE)
+endif()
+
 if(NOT CMAKE_SYSTEM_NAME STREQUAL "Android")
   # Android has pthread as part of its c library, not as a separate
   # libpthread.so.
diff --git a/src/Dictionaries/CassandraBlockInputStream.cpp b/src/Dictionaries/CassandraBlockInputStream.cpp
index 473a42549a8b80e112911061472b856cd3742060..6d8a45508ce9cf3feafcc18e73c0e17630d2fb04 100644
--- a/src/Dictionaries/CassandraBlockInputStream.cpp
+++ b/src/Dictionaries/CassandraBlockInputStream.cpp
@@ -1,16 +1,17 @@
-#    include <Common/config.h>
-#    include <Columns/ColumnNullable.h>
-#    include <Columns/ColumnString.h>
-#    include <Columns/ColumnsNumber.h>
-#    include <Core/ExternalResultDescription.h>
-#    include <Columns/ColumnString.h>
-#    include <IO/ReadHelpers.h>
+#if !defined(ARCADIA_BUILD)
+#include <Common/config.h>
+#endif
 
 #if USE_CASSANDRA
 
-#   include <utility>
-#   include "CassandraBlockInputStream.h"
-#   include "CassandraBlockInputStream.h"
+#include <utility>
+#include <Columns/ColumnNullable.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnsNumber.h>
+#include <Core/ExternalResultDescription.h>
+#include <Columns/ColumnString.h>
+#include <IO/ReadHelpers.h>
+#include "CassandraBlockInputStream.h"
 
 
 namespace DB
diff --git a/src/Dictionaries/CassandraDictionarySource.cpp b/src/Dictionaries/CassandraDictionarySource.cpp
index 4150fe56f14630ee0389d80b86746cb78207e7fa..2aee5d44b6ba64b1be03cee55c91f0d90b115a71 100644
--- a/src/Dictionaries/CassandraDictionarySource.cpp
+++ b/src/Dictionaries/CassandraDictionarySource.cpp
@@ -13,19 +13,16 @@ namespace DB
 
     void registerDictionarySourceCassandra(DictionarySourceFactory & factory)
     {
-        auto create_table_source = [=](const DictionaryStructure & dict_struct,
-                                     const Poco::Util::AbstractConfiguration & config,
-                                     const std::string & config_prefix,
-                                     Block & sample_block,
-                                     const Context & /* context */,
-                                     bool /*check_config*/) -> DictionarySourcePtr {
+        auto create_table_source = [=]([[maybe_unused]] const DictionaryStructure & dict_struct,
+                                       [[maybe_unused]] const Poco::Util::AbstractConfiguration & config,
+                                       [[maybe_unused]] const std::string & config_prefix,
+                                       [[maybe_unused]] Block & sample_block,
+                                                        const Context & /* context */,
+                                                        bool /*check_config*/) -> DictionarySourcePtr
+        {
 #if USE_CASSANDRA
         return std::make_unique<CassandraDictionarySource>(dict_struct, config, config_prefix + ".cassandra", sample_block);
 #else
-        (void)dict_struct;
-        (void)config;
-        (void)config_prefix;
-        (void)sample_block;
         throw Exception{"Dictionary source of type `cassandra` is disabled because library was built without cassandra support.",
                         ErrorCodes::SUPPORT_IS_DISABLED};
 #endif
@@ -37,9 +34,9 @@ namespace DB
 
 #if USE_CASSANDRA
 
-#    include <cassandra.h>
-#    include <IO/WriteHelpers.h>
-#    include "CassandraBlockInputStream.h"
+#include <cassandra.h>
+#include <IO/WriteHelpers.h>
+#include "CassandraBlockInputStream.h"
 
 namespace DB
 {
diff --git a/tests/integration/helpers/cluster.py b/tests/integration/helpers/cluster.py
index 49a18d1479621ec93b5b4f386dc374d396fddd34..a539db1d47f45a8a19ef657e9b916cf8af1d23ad 100644
--- a/tests/integration/helpers/cluster.py
+++ b/tests/integration/helpers/cluster.py
@@ -465,11 +465,11 @@ class ClickHouseCluster:
         start = time.time()
         while time.time() - start < timeout:
             try:
-                cass_client.connect().execute("drop keyspace if exists test;")
-                logging.info("Connected to Cassandra %s")
+                cass_client.connect()
+                logging.info("Connected to Cassandra")
                 return
             except Exception as ex:
-                logging.warning("Can't connect to Minio: %s", str(ex))
+                logging.warning("Can't connect to Cassandra: %s", str(ex))
                 time.sleep(1)
 
     def start(self, destroy_dirs=True):
diff --git a/tests/integration/test_dictionaries_all_layouts_and_sources/external_sources.py b/tests/integration/test_dictionaries_all_layouts_and_sources/external_sources.py
index 2dad70bc913a613dde6d462c86a49d61ec6edf05..336f3ddc28bbab73f62a9f116298b58019208715 100644
--- a/tests/integration/test_dictionaries_all_layouts_and_sources/external_sources.py
+++ b/tests/integration/test_dictionaries_all_layouts_and_sources/external_sources.py
@@ -447,6 +447,7 @@ class SourceCassandra(ExternalSource):
         self.client = cassandra.cluster.Cluster([self.internal_hostname], port=self.internal_port)
         self.session = self.client.connect()
         self.session.execute("create keyspace if not exists test with replication = {'class': 'SimpleStrategy', 'replication_factor' : 1};")
+        self.session.execute('drop table if exists test."{}"'.format(table_name))
         self.structure[table_name] = structure
         columns = ['"' + col.name + '" ' + self.TYPE_MAPPING[col.field_type] for col in structure.get_all_fields()]
         keys = ['"' + col.name + '"' for col in structure.keys]