Fixes some broken/missing references.