Make shared gadgets omit Rise ones, and fix critical bug just introduced