Fixed some errors caused by git