diff --git a/.gitignore b/.gitignore
index c3eeba3e..756c5ca3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@
 *.llb
 
 # Shared objects (inc. Windows DLLs)
-*.dll
 *.so
 *.so.*
 *.dylib
diff --git a/Custom Device Source/Scan Engine.lvproj b/Custom Device Source/Scan Engine.lvproj
index 67889765..489b4db0 100644
--- a/Custom Device Source/Scan Engine.lvproj	
+++ b/Custom Device Source/Scan Engine.lvproj	
@@ -217,6 +217,8 @@
 			<Item Name="Write To Spreadsheet File (DBL).vi" Type="VI" URL="../../Includes/Modules.lvlibp/1abvi3w/vi.lib/Utility/file.llb/Write To Spreadsheet File (DBL).vi"/>
 		</Item>
 		<Item Name="Custom Device Scan Engine.xml" Type="Document" URL="../Custom Device Scan Engine.xml"/>
+		<Item Name="nNIBlueBus_nCrioFixed_nRefnum.dll" Type="Document" URL="../../Includes/cRIO/nNIBlueBus_nCrioFixed_nRefnum.dll"/>
+		<Item Name="nNIBlueBus_nCrioFixed.dll" Type="Document" URL="../../Includes/cRIO/nNIBlueBus_nCrioFixed.dll"/>
 		<Item Name="Dependencies" Type="Dependencies">
 			<Item Name="vi.lib" Type="Folder">
 				<Item Name="Error Cluster From Error Code.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Error Cluster From Error Code.vi"/>
@@ -1474,13 +1476,14 @@
 				<Property Name="Bld_autoIncrement" Type="Bool">true</Property>
 				<Property Name="Bld_buildCacheID" Type="Str">{FB25B304-214F-4DC4-91F8-FA13F045F07F}</Property>
 				<Property Name="Bld_buildSpecName" Type="Str">Get HW Config</Property>
+				<Property Name="Bld_excludeDependentDLLs" Type="Bool">true</Property>
+				<Property Name="Bld_excludeDependentPPLs" Type="Bool">true</Property>
 				<Property Name="Bld_excludeInlineSubVIs" Type="Bool">true</Property>
 				<Property Name="Bld_excludeLibraryItems" Type="Bool">true</Property>
 				<Property Name="Bld_excludePolymorphicVIs" Type="Bool">true</Property>
 				<Property Name="Bld_localDestDir" Type="Path">../Built/NI_AB_PROJECTNAME/Applications</Property>
 				<Property Name="Bld_localDestDirType" Type="Str">relativeToCommon</Property>
 				<Property Name="Bld_modifyLibraryFile" Type="Bool">true</Property>
-				<Property Name="Bld_postActionVIID" Type="Ref">/My Computer/Build VIs.lvlib/Delete Data Folder.vi</Property>
 				<Property Name="Bld_previewCacheID" Type="Str">{5F918325-16D0-468C-AE69-2F3091353BA4}</Property>
 				<Property Name="Bld_version.build" Type="Int">30</Property>
 				<Property Name="Bld_version.major" Type="Int">1</Property>
@@ -1511,7 +1514,13 @@
 				<Property Name="Source[3].propertiesCount" Type="Int">3</Property>
 				<Property Name="Source[3].sourceInclusion" Type="Str">TopLevel</Property>
 				<Property Name="Source[3].type" Type="Str">VI</Property>
-				<Property Name="SourceCount" Type="Int">4</Property>
+				<Property Name="Source[4].destinationIndex" Type="Int">0</Property>
+				<Property Name="Source[4].itemID" Type="Ref">/My Computer/nNIBlueBus_nCrioFixed.dll</Property>
+				<Property Name="Source[4].sourceInclusion" Type="Str">Include</Property>
+				<Property Name="Source[5].destinationIndex" Type="Int">0</Property>
+				<Property Name="Source[5].itemID" Type="Ref">/My Computer/nNIBlueBus_nCrioFixed_nRefnum.dll</Property>
+				<Property Name="Source[5].sourceInclusion" Type="Str">Include</Property>
+				<Property Name="SourceCount" Type="Int">6</Property>
 				<Property Name="TgtF_fileDescription" Type="Str">Get HW Config</Property>
 				<Property Name="TgtF_internalName" Type="Str">Get HW Config</Property>
 				<Property Name="TgtF_legalCopyright" Type="Str">Copyright © 2021 </Property>
diff --git a/Custom Device Source/System Explorer/Applications/Call Get HW Config.vi b/Custom Device Source/System Explorer/Applications/Call Get HW Config.vi
index 4b34d3ec..835be65f 100644
Binary files a/Custom Device Source/System Explorer/Applications/Call Get HW Config.vi and b/Custom Device Source/System Explorer/Applications/Call Get HW Config.vi differ
diff --git a/Includes/cRIO/nNIBlueBus_nCrioFixed.dll b/Includes/cRIO/nNIBlueBus_nCrioFixed.dll
new file mode 100644
index 00000000..e5eed942
Binary files /dev/null and b/Includes/cRIO/nNIBlueBus_nCrioFixed.dll differ
diff --git a/Includes/cRIO/nNIBlueBus_nCrioFixed_nRefnum.dll b/Includes/cRIO/nNIBlueBus_nCrioFixed_nRefnum.dll
new file mode 100644
index 00000000..c78692f8
Binary files /dev/null and b/Includes/cRIO/nNIBlueBus_nCrioFixed_nRefnum.dll differ