Fix a bunch of missing references in ch8