Minor fixes relating to classes and links