Fix a number of cross-reference issues