Fixed plugins. Minor cleanup.