No height calc on trails. Other tweaks.