New version of plugins with a few fixes