some lint fixes
more fixes