Fixed some bugs caused by git.