A few small-ish tweaks.