Fix issues in the Yarrow plugin