Some infrastructure fixes.
Bug fixes in the plugins window.