More last-minute fixes