More links fixing