Some more minor changes.