Chao: fix many references