some fixes for git