Fix git usage problems