diff --git a/TopologicCore/include/Context.h b/TopologicCore/include/Context.h
index 8e215f7..3422e78 100644
--- a/TopologicCore/include/Context.h
+++ b/TopologicCore/include/Context.h
@@ -51,7 +51,7 @@ namespace TopologicCore
 		/// Returns the associated Topology.
 		/// </summary>
 		/// <returns>The associated topology</returns>
-		TOPOLOGIC_API std::shared_ptr<Topology> Topology() const;
+		TOPOLOGIC_API std::shared_ptr<TopologicCore::Topology> Topology() const;
 
 		/// <summary>
 		/// Returns the U parameter.
diff --git a/TopologicCore/include/Graph.h b/TopologicCore/include/Graph.h
index 4404954..c793c60 100644
--- a/TopologicCore/include/Graph.h
+++ b/TopologicCore/include/Graph.h
@@ -58,7 +58,7 @@ namespace TopologicCore
 
 		virtual ~Graph();
 
-		TOPOLOGIC_API Topology::Ptr Topology() const;
+		TOPOLOGIC_API TopologicCore::Topology::Ptr Topology() const;
 
 		TOPOLOGIC_API void Vertices(std::list<std::shared_ptr<Vertex>>& rVertices) const;
 
@@ -174,7 +174,7 @@ namespace TopologicCore
 
 		TOPOLOGIC_API void VerticesAtCoordinates(const double kX, const double kY, const double kZ, const double kTolerance, std::list<std::shared_ptr<Vertex>>& rVertices) const;
 
-		TOPOLOGIC_API std::shared_ptr<Edge> Edge(const std::shared_ptr<Vertex>& kpVertex1, const std::shared_ptr<Vertex>& kpVertex2, const double kTolerance) const;
+		TOPOLOGIC_API std::shared_ptr<TopologicCore::Edge> Edge(const std::shared_ptr<Vertex>& kpVertex1, const std::shared_ptr<Vertex>& kpVertex2, const double kTolerance) const;
 
 		void IncidentEdges(const std::shared_ptr<Vertex>& kpVertex, const double kTolerance, std::list<std::shared_ptr<TopologicCore::Edge>>& rEdges) const;
 
diff --git a/TopologicCore/include/Topology.h b/TopologicCore/include/Topology.h
index 4e53f1f..3d952e3 100644
--- a/TopologicCore/include/Topology.h
+++ b/TopologicCore/include/Topology.h
@@ -874,7 +875,7 @@ namespace TopologicCore
 	}
 
 	template <class Subclass>
-	static TopAbs_ShapeEnum Topology::CheckOcctShapeType()
+	TopAbs_ShapeEnum Topology::CheckOcctShapeType()
 	{
 		if (std::is_same<Subclass, Vertex>::value)
 		{