Fix static analysis leftovers