bcongdon Linting fixes