Some fixes with plugin name