Several plug-in fixes and improvements.