Two issues with simple tree [RTFACT-20439]