Improvements connected to plugin system crashes