Fixes for win