Tolerate unresolved links etc in 3.6