Gather usual pluggin metadata, too

Post-rebase fixes