Trickle height calculation improvements