Dll fixes