Some more lint fixes