Last-minute fixes.