fixes for plugin integration