Links migration fixes