Changes: various minor changes.