fix some stuff on Components gadget