Plug-In Manager fixes