Couple of last-minute fixes.