Further minor updates.