Fixed compatibility issues for full plugin based on stub