Fix some more plugin-breaking changes