further lint fixes