AUI-1785 Fixing dependency problems