Minor tweaks made for plugins