A few minor tweaks