Trying to fix some link issues