A few more last-minute fixes