A few minor tweaks (suggested by Reed and Brendan)