More minor changes.