Remove unrelated callout in popovers
Fix wrong plugin references in popovers