Grab latest fixes from upstream