diff --git a/fpga/include/villas/fpga/card.hpp b/fpga/include/villas/fpga/card.hpp
index e1b8a4566..3f0e3891d 100644
--- a/fpga/include/villas/fpga/card.hpp
+++ b/fpga/include/villas/fpga/card.hpp
@@ -36,16 +36,14 @@ public:
 
         virtual ~Card();
 
-
+        bool mapMemoryBlock(const std::shared_ptr<MemoryBlock> block);
+        bool unmapMemoryBlock(const MemoryBlock &block);
+	std::shared_ptr<kernel::vfio::Container> vfioContainer;
 
         std::shared_ptr<ip::Core> lookupIp(const std::string &name) const;
         std::shared_ptr<ip::Core> lookupIp(const Vlnv &vlnv) const;
         std::shared_ptr<ip::Core> lookupIp(const ip::IpIdentifier &id) const;
 
-        bool mapMemoryBlock(const std::shared_ptr<MemoryBlock> block);
-        bool unmapMemoryBlock(const MemoryBlock &block);
-	std::shared_ptr<kernel::vfio::Container> vfioContainer;
-
 protected:
 	// Keep a map of already mapped memory blocks
 	std::map<MemoryManager::AddressSpaceId, std::shared_ptr<MemoryBlock>> memoryBlocksMapped;
diff --git a/fpga/lib/utils.cpp b/fpga/lib/utils.cpp
index 071336cef..6fdede233 100644
--- a/fpga/lib/utils.cpp
+++ b/fpga/lib/utils.cpp
@@ -63,7 +63,7 @@ void fpga::ConnectString::parseString(std::string& connectString)
 		return;
 	}
 
-	std::regex regex("([0-9]+)([<\\->]+)([0-9]+|stdin|stdout)");
+	static const std::regex regex("([0-9]+)([<\\->]+)([0-9]+|stdin|stdout)");
 	std::smatch match;
 
 	if (!std::regex_match(connectString, match, regex) || match.size() != 4) {