some fixes for plugin classpath