Further tweaks to Git target code