Plugins: Small changes