Merging more of the chinese wc fixes