Minor upstream improvements
