Various small tweaks.