A few lint fixes