Tweaks to 172e9ac