Fix some tree methods