fixes for plugin