diff --git a/interface/web/dns/form/dns_cname.tform.php b/interface/web/dns/form/dns_cname.tform.php
index ca2419b1fd2211e918ecb49854d6254542766eaa..957e6e19e5256a470a4751b8c4c0e89a89d5d9c1 100644
--- a/interface/web/dns/form/dns_cname.tform.php
+++ b/interface/web/dns/form/dns_cname.tform.php
@@ -86,7 +86,7 @@ $form["tabs"]['dns'] = array (
 					'type' => 'TOLOWER')
 			),
 			'validators' => array (  0 => array ( 'type' => 'REGEX',
-					'regex' => '/^[a-zA-Z0-9\.\-\*]{0,255}$/',
+					'regex' => '/^[a-zA-Z0-9\.\-\*\_]{0,255}$/',
 					'errmsg'=> 'name_error_regex'),
 			),
 			'default' => '',
diff --git a/server/plugins-available/backup_plugin.inc.php b/server/plugins-available/backup_plugin.inc.php
index 3c3531c8077b1ba32a6dfd58d8b6237b6bc0a177..5b46930b10dc1a3eac068a6316b005c5a8ee195b 100644
--- a/server/plugins-available/backup_plugin.inc.php
+++ b/server/plugins-available/backup_plugin.inc.php
@@ -156,6 +156,7 @@ class backup_plugin {
 						}
 					}
 				}
+				if( $server_config['backup_dir_is_mount'] == 'y' ) $app->system->umount_backup_dir($backup_dir);
 			} else {
 				$app->log('Backup directory not ready.', LOGLEVEL_DEBUG);
 			}
@@ -227,6 +228,7 @@ class backup_plugin {
 						}
 					}
 				}
+				if( $server_config['backup_dir_is_mount'] == 'y' ) $app->system->umount_backup_dir($backup_dir);
 			} else {
 				$app->log('Backup directory not ready.', LOGLEVEL_DEBUG);
 			}
diff --git a/server/plugins-available/mail_plugin_dkim.inc.php b/server/plugins-available/mail_plugin_dkim.inc.php
index 7fea83c8a6c002e25d9446699f7d7f77d997c01d..284255153e220eec0f930ccab2f16a15d8a8f2c1 100755
--- a/server/plugins-available/mail_plugin_dkim.inc.php
+++ b/server/plugins-available/mail_plugin_dkim.inc.php
@@ -75,9 +75,9 @@ class mail_plugin_dkim {
 	 */
 	function get_amavis_config() {
 		$pos_config=array(
-			'/etc/amavisd.conf',
 			'/etc/amavisd.conf/50-user',
 			'/etc/amavis/conf.d/50-user',
+			'/etc/amavisd.conf',
 			'/etc/amavisd/amavisd.conf'
 		);
 		$amavis_configfile='';