add latest fixes that are supposed to go upstream as well