Various random tweaks, as always.