Plugin interface fixes