Fixing link issues