Tree grid fixes