diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index cf82630a..b5b0d786 100644
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -192,7 +192,7 @@ static void generate_analog_pattern(const struct sr_probe_group *probe_group, ui
 
 	switch (ag->pattern) {
 	case PATTERN_SQUARE:
-		value = 5.0;
+		value = ANALOG_AMPLITUDE;
 		last_end = 0;
 		for (i = 0; i < num_samples; i++) {
 			if (i % 5 == 0)
diff --git a/hwdriver.c b/hwdriver.c
index 55718117..04845000 100644
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -53,7 +53,7 @@ static struct sr_config_info sr_config_info_data[] = {
 	{SR_CONF_CAPTURE_RATIO, SR_T_UINT64, "captureratio",
 		"Pre-trigger capture ratio", NULL},
 	{SR_CONF_PATTERN_MODE, SR_T_CHAR, "pattern",
-		"Pattern generator mode", NULL},
+		"Pattern", NULL},
 	{SR_CONF_TRIGGER_TYPE, SR_T_CHAR, "triggertype",
 		"Trigger types", NULL},
 	{SR_CONF_EXTERNAL_CLOCK, SR_T_BOOL, "external_clock",