Fixing various links