diff --git a/components/services/audio_controls.c b/components/services/audio_controls.c
index 4104c561..0e2cf8b8 100644
--- a/components/services/audio_controls.c
+++ b/components/services/audio_controls.c
@@ -509,11 +509,8 @@ static esp_err_t actrls_init_json(const char *profile_name, bool create) {
 	const cJSON *button;
 	
 	if (!profile_name) return ESP_OK;
-	
-	config = config_alloc_get_str(profile_name, NULL, CONFIG_AUDIO_CONTROLS);
-	
-	if (!config) return ESP_FAIL;
-	else if (!*config) return ESP_OK; 
+	if ((config = config_alloc_get_str(profile_name, NULL, CONFIG_AUDIO_CONTROLS)) == NULL) return ESP_FAIL;
+	if (!*config) goto exit;
 		
 	ESP_LOGD(TAG,"Parsing JSON structure %s", config);
 	cJSON *buttons = cJSON_Parse(config);
@@ -528,8 +525,8 @@ static esp_err_t actrls_init_json(const char *profile_name, bool create) {
 			if(!cur_config) {
 				ESP_LOGE(TAG,"Config buffer was empty. ");
 				cJSON_Delete(buttons);
-				free(config);
-				return ESP_FAIL;
+				err = ESP_FAIL;
+				goto exit;
 			}
 			ESP_LOGD(TAG,"Processing button definitions. ");
 			cJSON_ArrayForEach(button, buttons){
@@ -560,6 +557,7 @@ static esp_err_t actrls_init_json(const char *profile_name, bool create) {
 	// the last init that completes will assigh the first json config object found, which will match
 	// the default config from nvs.
 	json_config = config_root;
+exit:	
 	free(config);
 	return err;
 }
diff --git a/components/spotify/cspot/bell/libhelix-mp3/assembly.h b/components/spotify/cspot/bell/libhelix-mp3/assembly.h
index ff7979b6..c55e329a 100644
--- a/components/spotify/cspot/bell/libhelix-mp3/assembly.h
+++ b/components/spotify/cspot/bell/libhelix-mp3/assembly.h
@@ -316,7 +316,7 @@ static __inline Word64 xSAR64(Word64 x, int n)
 }
 //mw
 
-#elif defined(__APPLE__) || defined(ESP_PLATFORM) || defined(__x86_64__)
+#elif defined(__APPLE__) || defined(ESP_PLATFORM) || defined(__amd64__)
 
 static __inline int FASTABS(int x)
 {
diff --git a/components/spotify/cspot/bell/libhelix-mp3/mp3dec.h b/components/spotify/cspot/bell/libhelix-mp3/mp3dec.h
index 4e28b1e7..f69eae39 100644
--- a/components/spotify/cspot/bell/libhelix-mp3/mp3dec.h
+++ b/components/spotify/cspot/bell/libhelix-mp3/mp3dec.h
@@ -67,7 +67,9 @@
 #
 #elif defined(__GNUC__) && defined(__thumb__)
 #
-#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+#elif defined(__GNUC__) && defined(__i386__)
+#
+#elif defined(__amd64__)
 #
 #elif defined(_OPENWAVE_SIMULATOR) || defined(_OPENWAVE_ARMULATOR)
 #
diff --git a/components/targets/muse/muse.c b/components/targets/muse/muse.c
index 7e7dc19e..87cf38f0 100644
--- a/components/targets/muse/muse.c
+++ b/components/targets/muse/muse.c
@@ -48,7 +48,7 @@ static void battery_svc(float value);
 static bool init(void);
 static void set_battery_led(float value);
 
-const struct target_s target_muse = { "muse", init };
+const struct target_s target_muse = { .model = "muse", .init = init };
 
 static bool init(void) { 
 	battery_handler_chain = battery_handler_svc;