diff --git a/archiver/ChangeLog b/archiver/ChangeLog
index f8408480c..d199cbd56 100644
--- a/archiver/ChangeLog
+++ b/archiver/ChangeLog
@@ -1,5 +1,7 @@
 2001-07-10  Bradford Hovinen  <hovinen@ximian.com>
 
+	* default-user.xml: Add sound-properties
+
 	* bonobo-moniker-archiver.c (archiver_resolve): Don't accept
 	PropertyBag interface
 
diff --git a/archiver/Makefile.am b/archiver/Makefile.am
index cebd7d868..b0b4689bd 100644
--- a/archiver/Makefile.am
+++ b/archiver/Makefile.am
@@ -1,7 +1,7 @@
 confexecdir = $(libdir)
 confexec_DATA = config_archiverConf.sh
 
-Locationmetadir = $(datadir)/control-center-data/archiver
+Locationmetadir = $(datadir)/control-center/archiver
 Locationmeta_DATA = default-user.xml default-global.xml
 
 includedir = $(prefix)/include/config-archiver
diff --git a/archiver/bonobo-config-archiver.c b/archiver/bonobo-config-archiver.c
index 607a36c9d..556a058bc 100644
--- a/archiver/bonobo-config-archiver.c
+++ b/archiver/bonobo-config-archiver.c
@@ -531,7 +531,10 @@ bonobo_config_archiver_class_init (BonoboConfigDatabaseClass *class)
 static void
 bonobo_config_archiver_init (BonoboConfigArchiver *archiver_db)
 {
-	archiver_db->dir = g_new0 (DirData, 1);	
+	archiver_db->dir = g_new0 (DirData, 1);
+
+	/* This will always be writeable */
+	BONOBO_CONFIG_DATABASE (archiver_db)->writeable = TRUE;
 }
 
 BONOBO_X_TYPE_FUNC (BonoboConfigArchiver, PARENT_TYPE, bonobo_config_archiver);
diff --git a/archiver/bonobo-moniker-archiver.c b/archiver/bonobo-moniker-archiver.c
index 422a705ab..fff85abe8 100644
--- a/archiver/bonobo-moniker-archiver.c
+++ b/archiver/bonobo-moniker-archiver.c
@@ -74,7 +74,6 @@ archiver_resolve (BonoboMoniker               *moniker,
 
 	name = bonobo_moniker_get_name (moniker);
 
-
 	if (parent != CORBA_OBJECT_NIL) {
 		pdb = Bonobo_Moniker_resolve (parent, options, 
 					      "IDL:Bonobo/ConfigDatabase:1.0", ev);
@@ -83,7 +82,6 @@ archiver_resolve (BonoboMoniker               *moniker,
 		
 		if (BONOBO_EX (ev) || pdb == CORBA_OBJECT_NIL)
 			return CORBA_OBJECT_NIL;
-
 	}
 
 	if (parse_name (name, &backend_id, &location) < 0) {
diff --git a/archiver/default-user.xml b/archiver/default-user.xml
index 7868ff38d..1788dcd2b 100644
--- a/archiver/default-user.xml
+++ b/archiver/default-user.xml
@@ -3,6 +3,7 @@
 <location>
   <contains backend="background-properties-capplet"/>
   <contains backend="bell-properties-capplet"/>
+  <contains backend="sound-properties"/>
   <contains backend="keyboard-properties"/>
   <contains backend="mouse-properties-capplet"/>
   <contains backend="screensaver-properties-capplet"/>
diff --git a/capplets/sound/ChangeLog b/capplets/sound/ChangeLog
index 3c34b4c46..5fc99a21d 100644
--- a/capplets/sound/ChangeLog
+++ b/capplets/sound/ChangeLog
@@ -15,6 +15,7 @@
 	(apply_settings): Use the correct setting name
 	(apply_cb): Apply settings and sync
 	(apply_settings): Kill esd when requested
+	(get_legacy_settings): Sync database
 
 	* sound-properties.xml: Fixed path name
 
diff --git a/capplets/sound/sound-properties-capplet.c b/capplets/sound/sound-properties-capplet.c
index 6955449e0..b4e96fa4e 100644
--- a/capplets/sound/sound-properties-capplet.c
+++ b/capplets/sound/sound-properties-capplet.c
@@ -144,9 +144,16 @@ static void
 get_legacy_settings (Bonobo_ConfigDatabase db) 
 {
 	gboolean val_boolean, def;
+	CORBA_Environment ev;
+
+	CORBA_exception_init (&ev);
 
 	COPY_FROM_LEGACY (boolean, "enable_esd", bool, "/sound/system/settings/start_esd=false");
 	COPY_FROM_LEGACY (boolean, "event_sounds", bool, "/sound/system/settings/event_sounds=false");
+
+	Bonobo_ConfigDatabase_sync (db, &ev);
+
+	CORBA_exception_free (&ev);
 }
 
 /* start_esd