Minor adjustments to support Git