some  fixes in plugins