Native plugins working again, misc fixes
Misc fixes