Other fixes are also included upstream