more lint fixes