diff --git a/src/Interpreters/InterpreterCreateQuery.cpp b/src/Interpreters/InterpreterCreateQuery.cpp
index ebd9388d6cf..36a37d1be4e 100644
--- a/src/Interpreters/InterpreterCreateQuery.cpp
+++ b/src/Interpreters/InterpreterCreateQuery.cpp
@@ -607,8 +607,8 @@ void InterpreterCreateQuery::setEngine(ASTCreateQuery & create) const
 
 void InterpreterCreateQuery::assertOrSetUUID(ASTCreateQuery & create, const DatabasePtr & database) const
 {
-    const auto kind = create.is_dictionary ? "Dictionary" : "Table";
-    const auto kind_upper = create.is_dictionary ? "DICTIONARY" : "TABLE";
+    const auto * kind = create.is_dictionary ? "Dictionary" : "Table";
+    const auto * kind_upper = create.is_dictionary ? "DICTIONARY" : "TABLE";
 
     if (database->getEngineName() == "Atomic")
     {
diff --git a/src/Storages/StorageReplicatedMergeTree.cpp b/src/Storages/StorageReplicatedMergeTree.cpp
index 3e49fe66fab..4f7889d63fd 100644
--- a/src/Storages/StorageReplicatedMergeTree.cpp
+++ b/src/Storages/StorageReplicatedMergeTree.cpp
@@ -187,7 +187,7 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
                     true,                   /// require_part_metadata
                     attach,
                     [this] (const std::string & name) { enqueuePartForCheck(name); })
-    , zookeeper_path(zookeeper_path_)
+    , zookeeper_path(normalizeZooKeeperPath(zookeeper_path_))
     , replica_name(replica_name_)
     , replica_path(zookeeper_path + "/replicas/" + replica_name)
     , reader(*this)