Adapt to sugar/sugar-toolkit changes