final lint fixes