AUI-1163 Fixing missing references