More tree normalization fixes