Additional fixes. Most important ones enable multiple plug-ins to work together.