Additional fixes.

Most important ones, for me, enable multiple plug-ins to work together.