A few minor tweaks I missed