Windows fixes. Seperated windows and unix builds.