Extension and fixes for windows.