Fixup some issues with plugin refcounting Upstream-commit: 5745a8531e7a52d4db09f2eafde0391b59a13b4b Component: engine