pluginAPI performance fixes