Some modifications based on git-extras.