Upstream lint issues