diff --git a/fpga/gpu/src/gpu.cpp b/fpga/gpu/src/gpu.cpp
index e6ab8eb6d..7131ec873 100644
--- a/fpga/gpu/src/gpu.cpp
+++ b/fpga/gpu/src/gpu.cpp
@@ -454,7 +454,7 @@ bool Gpu::init()
 {
 	auto& mm = MemoryManager::get();
 
-	const auto gpuPciEAddrSpaceName = mm.getMasterAddrSpaceName(getName(), "PCIe");
+	const auto gpuPciEAddrSpaceName = mm.getMasterAddrSpaceName(getName(), "pcie");
 	masterPciEAddrSpaceId = mm.getOrCreateAddressSpace(gpuPciEAddrSpaceName);
 
 	allocator = std::make_unique<GpuAllocator>(*this);
diff --git a/fpga/include/villas/fpga/ip_node.hpp b/fpga/include/villas/fpga/ip_node.hpp
index f8d8dc818..4513b9378 100644
--- a/fpga/include/villas/fpga/ip_node.hpp
+++ b/fpga/include/villas/fpga/ip_node.hpp
@@ -118,6 +118,10 @@ public:
 	virtual const StreamVertex&
 	getDefaultMasterPort() const;
 
+	const StreamGraph&
+	getGraph() const
+	{ return streamGraph; }
+
 
 	bool loopbackPossible() const;
 	bool connectLoopback();
diff --git a/fpga/lib/card.cpp b/fpga/lib/card.cpp
index b1077e4a8..0ba331f4b 100644
--- a/fpga/lib/card.cpp
+++ b/fpga/lib/card.cpp
@@ -119,7 +119,7 @@ PCIeCardFactory::create()
 
 PCIeCard::~PCIeCard()
 {
-	auto& mm = MemoryManager::get();
+	auto& mg = MemoryManager::get().getGraph();
 
 	// unmap all memory blocks
 	for (auto& mappedMemoryBlock : memoryBlocksMapped) {
diff --git a/fpga/src/villas-fpga-pipe.cpp b/fpga/src/villas-fpga-pipe.cpp
index 38595f607..85f324429 100644
--- a/fpga/src/villas-fpga-pipe.cpp
+++ b/fpga/src/villas-fpga-pipe.cpp
@@ -175,7 +175,7 @@ int main(int argc, char* argv[])
 	dma->makeAccesibleFromVA(block);
 
 	auto &mm = MemoryManager::get();
-	mm.getMemoryGraph().dump("graph.dot");
+	mm.getGraph().dump("graph.dot");
 
 	while (true) {
 		dma->read(block, block.getSize());
diff --git a/fpga/tests/dma.cpp b/fpga/tests/dma.cpp
index 69eaba17c..80297cc2c 100644
--- a/fpga/tests/dma.cpp
+++ b/fpga/tests/dma.cpp
@@ -100,7 +100,8 @@ Test(fpga, dma, .description = "DMA")
 		logger->info(CLR_GRN("Passed"));
 	}
 
-	MemoryManager::get().dump();
+	cr_assert(count > 0, "No DMA found");
 
-	cr_assert(count > 0, "No Dma found");
+	MemoryManager::getGraph().dump();
+	IpNode::getGraph().dump();
 }
diff --git a/fpga/tests/gpu.cpp b/fpga/tests/gpu.cpp
index a3ac86918..a86366b8a 100644
--- a/fpga/tests/gpu.cpp
+++ b/fpga/tests/gpu.cpp
@@ -142,7 +142,7 @@ Test(fpga, gpu_dma, .description = "GPU DMA tests")
 			                 CLR_RED("Failed"));
 		}
 
-		villas::MemoryManager::get().dump();
+		MemoryManager::getGraph().dump();
 	}