fix remaining windows build issues