Make native plugin bridge buildable
Cleanup & fix some bridge code
Some more plugin bridge work