More plugin system fixes.