VID-1834 Get all the links working properly.

Good find!