Tree options fixes