Fix link management