Minor fixes for new plugins.