DLL Windows fixes