[PATCH] Initial GConf2 fixups