1. Minor fixes to adjust to actual trails

    Closed
    #154473514 4 11 0 0