Minor coding changes