Override links fixes