AUI-1635 Fix lint problems