Reshuffling of plugins.
Fix plugins.