Zeqing Guo: Fix bugs