Minor last-minute fixes