Fixes a few of the problems with cross links