Fixes to links