More work&cleanup for plugin bridges