Fixes for plugin discovery