diff --git a/src/runtime/java/.classpath b/src/runtime/java/.classpath
index 233be1d2c..348eb9a2e 100644
--- a/src/runtime/java/.classpath
+++ b/src/runtime/java/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path=""/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="/home/krasimir/www.grammaticalframework.org/src/runtime/java/Release\ (posix)"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path=""/>
 </classpath>
diff --git a/src/runtime/java/.cproject b/src/runtime/java/.cproject
index e97542520..80a182eb1 100644
--- a/src/runtime/java/.cproject
+++ b/src/runtime/java/.cproject
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?>
-
-<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
 	<storageModule moduleId="org.eclipse.cdt.core.settings">
 		<cconfiguration id="cdt.managedbuild.config.gnu.so.debug.400252551">
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.so.debug.400252551" moduleId="org.eclipse.cdt.core.settings" name="Release (posix)">
@@ -39,7 +37,7 @@
 								<option id="gnu.c.compiler.so.debug.option.debugging.level.1237207564" name="Debug Level" superClass="gnu.c.compiler.so.debug.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/>
 								<option id="gnu.c.compiler.option.misc.other.1175867299" name="Other flags" superClass="gnu.c.compiler.option.misc.other" value="-c -fmessage-length=0 -std=c99" valueType="string"/>
 								<option id="gnu.c.compiler.option.include.paths.1273937011" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
-									<listOptionValue builtIn="false" value="/usr/lib/jvm/java-6-openjdk/include"/>
+									<listOptionValue builtIn="false" value="/usr/lib/jvm/java-7-openjdk/include"/>
 								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1522940706" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
 							</tool>
@@ -95,7 +93,7 @@
 							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base.195782523" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base">
 								<option id="gnu.cpp.compiler.option.optimization.level.2015381354" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
 								<option id="gnu.cpp.compiler.option.debugging.level.1457772208" name="Debug Level" superClass="gnu.cpp.compiler.option.debugging.level" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
-								<option id="gnu.cpp.compiler.option.other.other.323180951" superClass="gnu.cpp.compiler.option.other.other" value="-c -fmessage-length=0 -Wl,-add-stdcall-alias -static-libgcc" valueType="string"/>
+								<option id="gnu.cpp.compiler.option.other.other.323180951" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" value="-c -fmessage-length=0 -Wl,-add-stdcall-alias -static-libgcc" valueType="string"/>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.232555129" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
 							</tool>
 							<tool id="cdt.managedbuild.tool.gnu.c.compiler.mingw.base.1259094523" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.mingw.base">
@@ -149,4 +147,5 @@
 	<storageModule moduleId="refreshScope" versionNumber="1">
 		<resource resourceType="PROJECT" workspacePath="/jpgf"/>
 	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
 </cproject>
diff --git a/src/runtime/java/JPGFJar.jardesc b/src/runtime/java/JPGFJar.jardesc
index 2720a2479..1c35491fb 100644
--- a/src/runtime/java/JPGFJar.jardesc
+++ b/src/runtime/java/JPGFJar.jardesc
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <jardesc>
-    <jar path="jpgf/Release/jpgf.jar"/>
+    <jar path="jpgf/jpgf.jar"/>
     <options buildIfNeeded="true" compress="true" descriptionLocation="/jpgf/JPGFJar.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="true" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
     <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
     <selectedProjects/>