Fixes for PlantAdapter - WIP