Various last-minute tweaks.