Fixed infrastructural plugins.