some last-minute fixes