More tweaks to 172e9ac