Fixes from Meeting > Plugin Updates

Go through several fixes to improve plugin stability