Various small changes.