changes to enable building against carbon tree