Some fixes in plugins