add a few things I missed in the new trees

Change-Id: I148245182a53fb8a448b86e2c77f6868b3784cdc