diff --git a/src/Common/object_loader.h b/src/Common/object_loader.h
index 64ebe0ea8b4..a248dbe3428 100644
--- a/src/Common/object_loader.h
+++ b/src/Common/object_loader.h
@@ -92,7 +92,7 @@ struct CLoader
         template <typename T1, typename T2>
         static void add(T1& data, T2& value)
         {
-            add_helper<T1, T2>::add<is_tree_structure<T1>::value>(data, value);
+            add_helper<T1, T2>::template add<is_tree_structure<T1>::value>(data, value);
         }
 
         template <typename T>
diff --git a/src/xrAICore/Navigation/vertex_manager_hash_fixed_inline.h b/src/xrAICore/Navigation/vertex_manager_hash_fixed_inline.h
index 314b63dc0b9..ddbae5f9c5f 100644
--- a/src/xrAICore/Navigation/vertex_manager_hash_fixed_inline.h
+++ b/src/xrAICore/Navigation/vertex_manager_hash_fixed_inline.h
@@ -16,6 +16,10 @@
     CVertexManagerHashFixed<TPathId, TIndex, HashSize, FixSize>::CDataStorage<TPathBuilder, TVertexAllocator, \
         TCompoundVertex>
 
+#define CHashFixedVertexManagerT                                                                              \
+    typename CVertexManagerHashFixed<TPathId, TIndex, HashSize, FixSize>::template CDataStorage<TPathBuilder, \
+        TVertexAllocator, TCompoundVertex>
+
 TEMPLATE_SPECIALIZATION
 inline CHashFixedVertexManager::CDataStorage(const u32 vertex_count)
     : CDataStorageBase(vertex_count), CDataStorageAllocator(), m_current_path_id(PathId(0))
@@ -53,7 +57,7 @@ inline void CHashFixedVertexManager::add_opened(Vertex& vertex) { vertex.opened(
 TEMPLATE_SPECIALIZATION
 inline void CHashFixedVertexManager::add_closed(Vertex& vertex) { vertex.opened() = 0; }
 TEMPLATE_SPECIALIZATION
-inline typename CHashFixedVertexManager::PathId CHashFixedVertexManager::current_path_id() const
+inline CHashFixedVertexManagerT::PathId CHashFixedVertexManager::current_path_id() const
 {
     return m_current_path_id;
 }
@@ -84,7 +88,7 @@ inline bool CHashFixedVertexManager::is_visited(const Index& vertex_id) const
 TEMPLATE_SPECIALIZATION
 inline bool CHashFixedVertexManager::is_closed(const Vertex& vertex) const { return !is_opened(vertex); }
 TEMPLATE_SPECIALIZATION
-inline typename CHashFixedVertexManager::Vertex& CHashFixedVertexManager::get_node(const Index& vertex_id) const
+inline CHashFixedVertexManagerT::Vertex& CHashFixedVertexManager::get_node(const Index& vertex_id) const
 {
     VERIFY(is_visited(vertex_id));
     IndexVertex* vertex = m_hash[hash_index(vertex_id)];
@@ -98,7 +102,7 @@ inline typename CHashFixedVertexManager::Vertex& CHashFixedVertexManager::get_no
 }
 
 TEMPLATE_SPECIALIZATION
-inline typename CHashFixedVertexManager::Vertex& CHashFixedVertexManager::create_vertex(
+inline CHashFixedVertexManagerT::Vertex& CHashFixedVertexManager::create_vertex(
     Vertex& vertex, const Index& vertex_id)
 {
     // allocating new index node