Fixed some errors due to github