Fix link issues