some bugfixes for git-free feature