diff --git a/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/util/ServerUtils.java b/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/util/ServerUtils.java
index 8207d77..0fbd342 100644
--- a/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/util/ServerUtils.java
+++ b/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/util/ServerUtils.java
@@ -225,7 +225,7 @@
 		final List<String> uniqueStrings= new ArrayList<>(entries.size());
 		final StringBuilder sb= new StringBuilder();
 		for (final BundleEntry entry : entries) {
-			final String s= entry.getCodebaseString();
+			final String s= entry.getJClassPath().toUri().toString();
 			if (s != null && !uniqueStrings.contains(s)) {
 				sb.append(s);
 				sb.append(' ');
diff --git a/eclient/org.eclipse.statet.rj.eclient.graphics/src/org/eclipse/statet/internal/rj/eclient/graphics/PreferenceInitializer.java b/eclient/org.eclipse.statet.rj.eclient.graphics/src/org/eclipse/statet/internal/rj/eclient/graphics/PreferenceInitializer.java
index afde0a1..485bf90 100644
--- a/eclient/org.eclipse.statet.rj.eclient.graphics/src/org/eclipse/statet/internal/rj/eclient/graphics/PreferenceInitializer.java
+++ b/eclient/org.eclipse.statet.rj.eclient.graphics/src/org/eclipse/statet/internal/rj/eclient/graphics/PreferenceInitializer.java
@@ -18,6 +18,7 @@
 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
 import org.eclipse.core.runtime.preferences.DefaultScope;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.IScopeContext;
 
 import org.eclipse.statet.rj.eclient.graphics.RGraphics;
 
@@ -31,7 +32,7 @@
 	
 	@Override
 	public void initializeDefaultPreferences() {
-		final DefaultScope defaultScope= new DefaultScope();
+		final IScopeContext defaultScope= DefaultScope.INSTANCE;
 		final IEclipsePreferences node= defaultScope.getNode(RGraphics.FONTS_PREF_QUALIFIER);
 		if (Platform.getOS().startsWith("win")) {
 			node.put(RGraphics.PREF_FONTS_SERIF_FONTNAME_KEY, "Times New Roman"); //$NON-NLS-1$