Fixes for win shit