Fixed mercurial stuff