Some small modifications.