Fix plug-in regressions.