Small build and windows improvements