Corrected links and annotations