Touchups to pluginapi