Fixed some missing references due to the merge - there may be more.