Last-minute fixes