Fix link generation