Fix the links issues