Fixes for git issues.