Commit a few build fixers, but I can not fix it all: remove CJK until its fixed