Minor consistency changes and other minor changes