fix some issues with git