General cleanup
Fix last commit; Ensure NativePlugin descriptors deletion on quit