Minor modifications.