Small gadget fixes