Additional fixes for objective tree