More link order fixes