last-minute fixes.