diff --git a/context/runtime/boot/entrypoint.sh b/context/runtime/boot/entrypoint.sh
index f53aa1b..ad3bee8 100755
--- a/context/runtime/boot/entrypoint.sh
+++ b/context/runtime/boot/entrypoint.sh
@@ -9,8 +9,8 @@ readonly root
 . "$root/mdns.sh"
 
 helpers::dir::writable "$XDG_RUNTIME_DIR/dbus" create
-helpers::dir::writable "$XDG_RUNTIME_DIR/shairport-sync/metadata" create
-helpers::dir::writable "$XDG_CACHE_HOME/shairport-sync/coverart" create
+helpers::dir::writable "$XDG_RUNTIME_DIR/shairport-sync" create
+helpers::dir::writable "$XDG_CACHE_HOME/shairport-sync" create
 helpers::dir::writable "$XDG_STATE_HOME/avahi-daemon"
 
 mdns::start::dbus
@@ -31,12 +31,12 @@ mqtt = {
 	enabled = "%s"; // set this to yes to enable the mqtt-metadata-service
 	hostname = "%s"; // Hostname of the MQTT Broker
 	port = %s; // Port on the MQTT Broker to connect to
-	username = %s; //set this to a string to your username in order to enable username authentication
-	password = %s; //set this to a string you your password in order to enable username & password authentication
+	username = "%s"; //set this to a string to your username in order to enable username authentication
+	password = "%s"; //set this to a string you your password in order to enable username & password authentication
 //	capath = NULL; //set this to the folder with the CA-Certificates to be accepted for the server certificate. If not set, TLS is not used
-	cafile = %s; //this may be used as an (exclusive) alternative to capath with a single file for all ca-certificates
-	certfile = %s; //set this to a string to a user certificate to enable MQTT Client certificates. keyfile must also be set!
-	keyfile = %s; //private key for MQTT Client authentication
+	cafile = "%s"; //this may be used as an (exclusive) alternative to capath with a single file for all ca-certificates
+	certfile = "%s"; //set this to a string to a user certificate to enable MQTT Client certificates. keyfile must also be set!
+	keyfile = "%s"; //private key for MQTT Client authentication
 //	topic = NULL; //MQTT topic where this instance of shairport-sync should publish. If not set, the general.name value is used.
 //	publish_raw = "no"; //whether to publish all available metadata under the codes given in the metadata docs.
 //	publish_parsed = "no"; //whether to publish a small (but useful) subset of metadata under human-understandable topics
diff --git a/context/runtime/magnetar/system/config/shairport-sync/main.conf b/context/runtime/magnetar/system/config/shairport-sync/main.conf
index a2e447c..6a80ae8 100644
--- a/context/runtime/magnetar/system/config/shairport-sync/main.conf
+++ b/context/runtime/magnetar/system/config/shairport-sync/main.conf
@@ -211,7 +211,7 @@ dsp =
 // In those cases, "enabled" and "include_cover_art" will both be "yes" by default
 metadata =
 {
-  cover_art_cache_directory = "/magnetar/cache/shairport-sync/coverart";
+  cover_art_cache_directory = "/magnetar/cache/shairport-sync";
   pipe_name = "/magnetar/runtime/shairport-sync/metadata";
 
 //	enabled = "yes"; // set this to yes to get Shairport Sync to solicit metadata from the source and to pass it on via a pipe