More link fixes per #28