Nutupane bulk actions: fixes after cherry-picking.