Minor coding changes.