Changing some link issues