Pull in upstream fixes