Further updates from upstream