some git-client fixes required