Some other minor changes.