- more upstream fixes