diff --git a/src/Build/Include/Makefile.inc b/src/Build/Include/Makefile.inc
index 52e0d650..be534871 100644
--- a/src/Build/Include/Makefile.inc
+++ b/src/Build/Include/Makefile.inc
@@ -96,7 +96,7 @@ endif
 
 # Embedded files
 ifeq "$(PLATFORM)" "OpenBSD"
-OD_BIN := ggod -v -t u1 -A n
+OD_BIN := hexdump -v -e '1/1 "%u "'
 else
 OD_BIN := od -v -t u1 -A n
 endif
diff --git a/src/Common/SCardManager.cpp b/src/Common/SCardManager.cpp
index 40578d39..cb97c1a0 100644
--- a/src/Common/SCardManager.cpp
+++ b/src/Common/SCardManager.cpp
@@ -7,12 +7,16 @@ namespace VeraCrypt
 
 	SCardManager::SCardManager()
 	{
+#ifndef TC_OPENBSD
 		loader->Initialize();
+#endif
 	}
 
 	SCardManager::~SCardManager()
 	{
+#ifndef TC_OPENBSD
 		loader->Finalize();
+#endif
 	}
 
 	vector<wstring> SCardManager::GetReaders()
@@ -106,4 +110,4 @@ namespace VeraCrypt
 
 		throw InvalidEMVPath();
 	}
-}
\ No newline at end of file
+}