Unify windows and unix builds (again)