diff --git a/src/build_settings.cpp b/src/build_settings.cpp
index 1f5aba254..8339b111a 100644
--- a/src/build_settings.cpp
+++ b/src/build_settings.cpp
@@ -1574,6 +1574,8 @@ gb_internal void init_android_values(bool with_sdk) {
 
 
 	bc->ODIN_ANDROID_JAR_SIGNER = normalize_path(permanent_allocator(), make_string_c(gb_get_env("ODIN_ANDROID_JAR_SIGNER", permanent_allocator())), NIX_SEPARATOR_STRING);
+	// Strip trailing slash so system() call doesn't fail.
+	bc->ODIN_ANDROID_JAR_SIGNER = substring(bc->ODIN_ANDROID_JAR_SIGNER, 0, bc->ODIN_ANDROID_JAR_SIGNER.len - 1);
 	if (with_sdk) {
 		if (bc->ODIN_ANDROID_SDK.len == 0)  {
 			gb_printf_err("Error: ODIN_ANDROID_SDK not set, which is required for -build-mode:executable for -subtarget:android");
diff --git a/src/bundle_command.cpp b/src/bundle_command.cpp
index b3bca2b51..c5274ca3d 100644
--- a/src/bundle_command.cpp
+++ b/src/bundle_command.cpp
@@ -132,7 +132,7 @@ i32 bundle_android(String original_init_directory) {
 	if (current_directory.len != 0) {
 		bool ok = set_working_directory(init_directory);
 		if (!ok) {
-			gb_printf_err("Error: Unable to currectly set the current working directory to '%.*s'\n", LIT(init_directory));
+			gb_printf_err("Error: Unable to correctly set the current working directory to '%.*s'\n", LIT(init_directory));
 		}
 	}
 
@@ -174,7 +174,8 @@ i32 bundle_android(String original_init_directory) {
 		cmd = gb_string_append_length(cmd, build_context.ODIN_ANDROID_JAR_SIGNER.text, build_context.ODIN_ANDROID_JAR_SIGNER.len);
 		cmd = gb_string_append_fmt(cmd, " -storepass android");
 		if (build_context.android_keystore.len != 0) {
-			String keystore = concatenate_strings(temporary_allocator(), current_directory, build_context.android_keystore);
+			String keystore = normalize_path(temporary_allocator(), build_context.android_keystore, NIX_SEPARATOR_STRING);
+			keystore = substring(keystore, 0, keystore.len - 1);
 			cmd = gb_string_append_fmt(cmd, " -keystore \"%.*s\"", LIT(keystore));
 		}
 		cmd = gb_string_append_fmt(cmd, " \"%.*s.apk-build\"", LIT(output_apk));