diff --git a/iscsi-scst/usr/chap.c b/iscsi-scst/usr/chap.c
index f5d69b10f..2e6131816 100644
--- a/iscsi-scst/usr/chap.c
+++ b/iscsi-scst/usr/chap.c
@@ -38,7 +38,7 @@
 #define BASE64_FORMAT 0x02
 
 #define CHAP_DIGEST_ALG_MD5   5
-#define CHAP_DIGEST_ALG_SHA1  7
+#define CHAP_DIGEST_ALG_SHA1  6
 
 #define CHAP_MD5_DIGEST_LEN  16
 #define CHAP_SHA1_DIGEST_LEN 20
@@ -370,7 +370,7 @@ static int chap_initiator_auth_create_challenge(struct connection *conn)
 			conn->auth.chap.digest_alg = CHAP_DIGEST_ALG_MD5;
 			conn->auth_state = CHAP_AUTH_STATE_CHALLENGE;
 			break;
-		} else if (!strcmp(p, "7")) {
+		} else if (!strcmp(p, "6")) {
 			conn->auth.chap.digest_alg = CHAP_DIGEST_ALG_SHA1;
 			conn->auth_state = CHAP_AUTH_STATE_CHALLENGE;
 			break;
diff --git a/scstadmin/scstadmin.sysfs/scst-1.0.0/lib/SCST/SCST.pm b/scstadmin/scstadmin.sysfs/scst-1.0.0/lib/SCST/SCST.pm
index cedc44742..5a5ab48b2 100644
--- a/scstadmin/scstadmin.sysfs/scst-1.0.0/lib/SCST/SCST.pm
+++ b/scstadmin/scstadmin.sysfs/scst-1.0.0/lib/SCST/SCST.pm
@@ -2223,8 +2223,14 @@ sub replaceLun {
 	$o_string =~ s/\s$//;
 
 	my ($path, $cmd);
-	$path = make_path(SCST_TARGETS_DIR(), $driver, $target, SCST_LUNS,
-			  SCST_MGMT_IO);
+	if (defined($group)) {
+		$path = make_path(SCST_TARGETS_DIR(), $driver, $target,
+				  SCST_GROUPS, $group, SCST_LUNS,
+				  SCST_MGMT_IO);
+	} else {
+		$path = make_path(SCST_TARGETS_DIR(), $driver, $target,
+				  SCST_LUNS, SCST_MGMT_IO);
+	}
 	$cmd .= "replace $device $lun $o_string";
 
 	my $bytes = - ENOENT;