[Custom]: Even more link fixes and tweakage around dependent spec shifts.