Fix lint errors, refs T120