diff --git a/cmd/android_ab_select.c b/cmd/android_ab_select.c
index 512fa48d90..2e3a3116ba 100644
--- a/cmd/android_ab_select.c
+++ b/cmd/android_ab_select.c
@@ -35,7 +35,7 @@ static int do_android_ab_select(cmd_tbl_t *cmdtp, int flag, int argc,
 	/* Android standard slot names are 'a', 'b', ... */
 	slot[0] = ANDROID_BOOT_SLOT_NAME(ret);
 	slot[1] = '\0';
-	setenv(argv[1], slot);
+	env_set(argv[1], slot);
 	printf("ANDROID: Booting slot: %s\n", slot);
 	return CMD_RET_SUCCESS;
 }
diff --git a/common/android_bootloader.c b/common/android_bootloader.c
index 5c659c7576..8ed3b378d6 100644
--- a/common/android_bootloader.c
+++ b/common/android_bootloader.c
@@ -200,7 +200,8 @@ static char *strjoin(const char **chunks, char separator)
 		*current = separator;
 		current++;
 	}
-	*current = '\0';
+	/* Replace the last separator by a \0. */
+	current[-1] = '\0';
 	return ret;
 }