AUI-1107 Fix lint errors