Update and fix some gadgets