Improve link compatibility some more