Fix and build for root match issues