Fix some changes related to github