AUI-912 - Fix missing variables