Small fixes and new plugin version