Fix git build issues