Updates to reflect new jhbuild changes