Some updates from upstream