Minor modifications

Minor modifications