apply upstream fixes