Add location, link fixes