fix some suggestion from baidu