Miller-Driscoll last-minute fixes