Minor changes and fixes.
Note that most of these fixes have no effect yet on the plug-ins.