Updates to support LDP changes upstream