Tweaks to work out of the box with sugar-dev-box