diff --git a/briar-android/briar-android.iml b/briar-android/briar-android.iml
index 8237583e3..6e88d67ad 100644
--- a/briar-android/briar-android.iml
+++ b/briar-android/briar-android.iml
@@ -59,18 +59,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
diff --git a/briar-api/briar-api.iml b/briar-api/briar-api.iml
index 58d6d226a..3d154955e 100644
--- a/briar-api/briar-api.iml
+++ b/briar-api/briar-api.iml
@@ -28,6 +28,5 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="guice-3.0-no_aop" level="project" />
     <orderEntry type="library" exported="" name="javax.inject" level="project" />
-    <orderEntry type="library" exported="" name="briar-api.briar-api" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/briar-api/build.gradle b/briar-api/build.gradle
index 8612e9361..e273f64dd 100644
--- a/briar-api/build.gradle
+++ b/briar-api/build.gradle
@@ -1,4 +1,6 @@
 apply plugin: 'java'
+sourceCompatibility = 1.6
+targetCompatibility = 1.6
 
 dependencies {
     compile fileTree(dir: 'libs', include: '*.jar')
diff --git a/briar-core/briar-core.iml b/briar-core/briar-core.iml
index 36261ca61..0cd707f81 100644
--- a/briar-core/briar-core.iml
+++ b/briar-core/briar-core.iml
@@ -32,6 +32,5 @@
     <orderEntry type="library" exported="" name="h2small-1.4.190" level="project" />
     <orderEntry type="library" exported="" name="spongy-core-1.53" level="project" />
     <orderEntry type="library" exported="" name="weupnp-0.1.3-SNAPSHOT-briar" level="project" />
-    <orderEntry type="library" exported="" name="briar-core.briar-core" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/briar-core/build.gradle b/briar-core/build.gradle
index ad7abbba7..0a453adab 100644
--- a/briar-core/build.gradle
+++ b/briar-core/build.gradle
@@ -1,4 +1,6 @@
 apply plugin: 'java'
+sourceCompatibility = 1.6
+targetCompatibility = 1.6
 
 dependencies {
     compile fileTree(dir: '../briar-api/libs', include: '*.jar')
diff --git a/briar-desktop/build.gradle b/briar-desktop/build.gradle
index 3a21e1053..6331560ba 100644
--- a/briar-desktop/build.gradle
+++ b/briar-desktop/build.gradle
@@ -1,4 +1,6 @@
 apply plugin: 'java'
+sourceCompatibility = 1.6
+targetCompatibility = 1.6
 
 dependencies {
     compile fileTree(dir: '../briar-api/libs', include: '*.jar')
diff --git a/briar-tests/build.gradle b/briar-tests/build.gradle
index a93c46de4..65a3428f0 100644
--- a/briar-tests/build.gradle
+++ b/briar-tests/build.gradle
@@ -1,4 +1,6 @@
 apply plugin: 'java'
+sourceCompatibility = 1.6
+targetCompatibility = 1.6
 
 dependencies {
     compile fileTree(dir: '../briar-api/libs', include: '*.jar')