fix regressions for plugins