Other minor changes.