Minor additional modifications.