Fix a bunch of lint test errors