Minor refinements to the build tasks to reflect new Gadget API