some updates for git related fix