Fixed infusionSite, and minor bugs in base plugin.