Minor fixes and edit plugins.