Last-minute tweaks