Plugin interface: Small fixes