Fix the rest of the links