Some fixes to links