Fix some bugs by pull requests