Fixed some Eva tree building errors.