Bug fixes in plugins section. should no crash