Fix cross-referencing issues (closes #9)

12 jobs for issue_9 in 7 minutes and 54 seconds (queued for 7 seconds)