Fix warnings (Xin Li)