Fixing some things in build forest.