mtibben More linting fixes