Fixes
Test yaybu on win