Fix some git related things