some fixes to git