Fix some bug for serengeti project.