diff --git a/contrib/epee/include/serialization/keyvalue_helpers.h b/contrib/epee/include/serialization/keyvalue_helpers.h
index 14997aa4..ae72d4b3 100644
--- a/contrib/epee/include/serialization/keyvalue_helpers.h
+++ b/contrib/epee/include/serialization/keyvalue_helpers.h
@@ -106,9 +106,9 @@ namespace epee
       return res;
     if constexpr (is_std_optional<t_pod_type>::value)
     {
-      t_pod_type::value_type v = AUTO_VAL_INIT(v);
+      typename t_pod_type::value_type v = AUTO_VAL_INIT(v);
       if (!epee::string_tools::hex_to_pod(a, v))
-        throw std::runtime_error(std::string("Unable to transform \"") + a + "\" to pod type " + typeid(t_pod_type::value_type).name());
+        throw std::runtime_error(std::string("Unable to transform \"") + a + "\" to pod type " + typeid(typename t_pod_type::value_type).name());
       return v;
     }
 
diff --git a/tests/core_tests/tx_validation.cpp b/tests/core_tests/tx_validation.cpp
index db6ae4ac..f82c3a10 100644
--- a/tests/core_tests/tx_validation.cpp
+++ b/tests/core_tests/tx_validation.cpp
@@ -9,7 +9,7 @@
 #include "offers_tests_common.h"
 #include "tx_builder.h"
 #include "chaingen_helpers.h"
-#include "..\..\src\currency_core\tx_semantic_validation.h"
+#include "../../src/currency_core/tx_semantic_validation.h"
 
 using namespace epee;
 using namespace crypto;