Fixing links et al