Minor improvements on links