[SD-1068] lint fixes