More updates for pluginbase changes.