Some DLL improvements