Fix for constructing gadget sets before dashboard load