Further activity_plant tweaks