Windows-agnostic changes after Daijiang's tests