A few more adjustments of match the previous git version