Fixing some link issues