Link fixes from Jon Avila