Even more lint test fixes