Few more archive link fixes