A few more lint fixes