Fixed (some) link handling things.