Several minor updates.