Fixes for the windows.