Further fixes to links