assorted last-minute fixes