Update to match latest sugar-build