diff --git a/course/edit_form.php b/course/edit_form.php
index 9c8f79f11f2..4ac54d12107 100644
--- a/course/edit_form.php
+++ b/course/edit_form.php
@@ -262,7 +262,7 @@ class course_edit_form extends moodleform {
         $choices['0'] = get_string('no');
         $choices['1'] = get_string('yes');
         $mform->addElement('select', 'expirynotify', get_string('notify'), $choices);
-        $mform->addHelpButton('expirynotify', 'expirynotify');
+        $mform->addHelpButton('expirynotify', 'notify');
         $mform->setDefault('expirynotify', $courseconfig->expirynotify);
 
         $mform->addElement('select', 'notifystudents', get_string('expirynotifystudents'), $choices);
@@ -285,15 +285,15 @@ class course_edit_form extends moodleform {
         $choices[NOGROUPS] = get_string('groupsnone', 'group');
         $choices[SEPARATEGROUPS] = get_string('groupsseparate', 'group');
         $choices[VISIBLEGROUPS] = get_string('groupsvisible', 'group');
-        $mform->addElement('select', 'groupmode', get_string('groupmode'), $choices);
-        $mform->addHelpButton('groupmode', 'groupmode');
+        $mform->addElement('select', 'groupmode', get_string('groupmode', 'group'), $choices);
+        $mform->addHelpButton('groupmode', 'groupmode', 'group');
         $mform->setDefault('groupmode', $courseconfig->groupmode);
 
         $choices = array();
         $choices['0'] = get_string('no');
         $choices['1'] = get_string('yes');
-        $mform->addElement('select', 'groupmodeforce', get_string('force'), $choices);
-        $mform->addHelpButton('groupmodeforce', 'groupmodeforce');
+        $mform->addElement('select', 'groupmodeforce', get_string('groupmodeforce', 'group'), $choices);
+        $mform->addHelpButton('groupmodeforce', 'groupmodeforce', 'group');
         $mform->setDefault('groupmodeforce', $courseconfig->groupmodeforce);
 
         //default groupings selector
diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index 12f2d94e966..142034d6664 100644
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -204,7 +204,7 @@ $string['backupversion'] = 'Backup Version';
 $string['block'] = 'Block';
 $string['blockconfiga'] = 'Configuring a {$a} block';
 $string['blockconfigbad'] = 'This block has not been implemented correctly and thus cannot provide a configuration interface.';
-$string['blockdeleteconfirm'] = 'You are about to completely delete the block \'{$a}\'.  This will completely delete everything in the database associated with this block.  Are you SURE you want to continue?';
+$string['blockdeleteconfirm'] = 'You are about to completely delete the block \'{$a}\'.  This will completely delete everything in the database associated with this block. Are you SURE you want to continue?';
 $string['blockdeletefiles'] = 'All data associated with the block \'{$a->block}\' has been deleted from the database.  To complete the deletion (and prevent the block re-installing itself), you should now delete this directory from your server: {$a->directory}';
 $string['blocks'] = 'Blocks';
 $string['blocksaddedit'] = 'Add/Edit Blocks';