.DLL fixes