Plugin specs

With related bugfixes