a couple bugs fixed with build tree.