More upstream changes/tweaks