Hotfix b

Contains all of the fixes in Hotfix b, excluding the compiled DLL.