Fix up some entries to use scoped_ops