Cleanup/fix links