diff --git a/core/plugins/org.eclipse.dltk.core/model/org/eclipse/dltk/internal/core/BuiltinProjectFragment.java b/core/plugins/org.eclipse.dltk.core/model/org/eclipse/dltk/internal/core/BuiltinProjectFragment.java
index 811c81f..0f702c1 100644
--- a/core/plugins/org.eclipse.dltk.core/model/org/eclipse/dltk/internal/core/BuiltinProjectFragment.java
+++ b/core/plugins/org.eclipse.dltk.core/model/org/eclipse/dltk/internal/core/BuiltinProjectFragment.java
@@ -136,8 +136,8 @@
 		}
 		try {
 			BuiltinScriptFolderInfo fragInfo = new BuiltinScriptFolderInfo();
-			fldr.computeChildren(fragInfo, this.builtinProvider
-					.getBuiltinModules());
+			fldr.computeChildren(fragInfo,
+					this.builtinProvider.getBuiltinModules());
 			fldr.computeForeignResources(fragInfo);
 			newElements.put(fldr, fragInfo);
 		} catch (IllegalArgumentException e) {
@@ -298,8 +298,7 @@
 		Map<IPath, IBuildpathEntry> rootPathToRawEntries = project
 				.getPerProjectInfo().rootPathToRawEntries;
 		if (rootPathToRawEntries != null) {
-			rawEntry = rootPathToRawEntries.get(new Path(this.getPath()
-					.segment(0)));
+			rawEntry = rootPathToRawEntries.get(this.getPath());
 		}
 		if (rawEntry == null) {
 			throw new ModelException(new ModelStatus(
