Pull in upstream bug fixes. Fix lint.