Last changes for Windows. From Morten Kromberg