HG: Minor changes to get pull request