Some more link fixups