last batch of lint fixes