Get upstream fixes