Some links issues fixed