diff --git a/src/crypto/RIPEMD160_helper.cpp b/src/crypto/RIPEMD160_helper.cpp
index 1386540a..78d43915 100644
--- a/src/crypto/RIPEMD160_helper.cpp
+++ b/src/crypto/RIPEMD160_helper.cpp
@@ -1,9 +1,6 @@
 // Copyright (c) 2020 The Zano developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-#pragma once
-
 #include "RIPEMD160_helper.h"
 #include "auto_val_init.h"
 extern "C" {
diff --git a/tests/core_tests/chaingen.h b/tests/core_tests/chaingen.h
index e6b9fb02..2208a701 100644
--- a/tests/core_tests/chaingen.h
+++ b/tests/core_tests/chaingen.h
@@ -777,8 +777,8 @@ bool construct_broken_tx(const currency::account_keys& sender_account_keys, cons
     if (!(in_ephemeral.pub == src_entr.outputs[src_entr.real_output].second))
     {
       LOG_ERROR("derived public key missmatch with output public key! " << ENDL << "derived_key:"
-        << string_tools::pod_to_hex(in_ephemeral.pub) << ENDL << "real output_public_key:"
-        << string_tools::pod_to_hex(src_entr.outputs[src_entr.real_output].second));
+        << epst::pod_to_hex(in_ephemeral.pub) << ENDL << "real output_public_key:"
+        << epst::pod_to_hex(src_entr.outputs[src_entr.real_output].second));
       return false;
     }
 
@@ -979,7 +979,7 @@ void append_vector_by_another_vector(U& dst, const V& src)
   {                                                                                   \
     callback_entry ce = AUTO_VAL_INIT(ce);                                            \
     ce.callback_name = CB_NAME;                                                       \
-    ce.callback_params = epee::string_tools::pod_to_hex(PARAMS_POD_OBJ);              \
+    ce.callback_params = epst::pod_to_hex(PARAMS_POD_OBJ);                            \
     VEC_EVENTS.push_back(ce);                                                         \
     PRINT_EVENT_NO(VEC_EVENTS);                                                       \
   }
diff --git a/tests/core_tests/chaingen_helpers.h b/tests/core_tests/chaingen_helpers.h
index 510d5c89..c2cbd204 100644
--- a/tests/core_tests/chaingen_helpers.h
+++ b/tests/core_tests/chaingen_helpers.h
@@ -199,13 +199,13 @@ struct log_level_scope_changer
 {
   log_level_scope_changer(int desired_log_level)
   {
-    m_original_log_level = log_space::get_set_log_detalisation_level();
-    log_space::get_set_log_detalisation_level(true, desired_log_level);
+    m_original_log_level = epee::log_space::get_set_log_detalisation_level();
+    epee::log_space::get_set_log_detalisation_level(true, desired_log_level);
   }
 
   ~log_level_scope_changer()
   {
-    log_space::get_set_log_detalisation_level(true, m_original_log_level);
+    epee::log_space::get_set_log_detalisation_level(true, m_original_log_level);
   }
 
   int m_original_log_level;
diff --git a/tests/unit_tests/wallet_seed_test.cpp b/tests/unit_tests/wallet_seed_test.cpp
index d2ae5236..efbd2829 100644
--- a/tests/unit_tests/wallet_seed_test.cpp
+++ b/tests/unit_tests/wallet_seed_test.cpp
@@ -193,7 +193,9 @@ TEST(wallet_seed, basic_test)
     if (r)
     {
       if (wse.timestamp)
+      {
         ASSERT_EQ(wse.timestamp, acc.get_createtime());
+      }
 
       ASSERT_EQ(wse.auditable, acc.get_public_address().is_auditable());