More improvements to OOTB gadgets