Fixes for win impl