Further changes to links out of the box