update latest fixes from upstream