last-minute fixes