diff --git a/lib/BUCK b/lib/BUCK
index 28e3144..bbd8cf3 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -11,7 +11,7 @@
 maven_jar(
   name = 'gitblit-jar',
   id = 'com.gitblit:gitblit:1.7.0-SNAPSHOT',
-  sha1 = 'bf24e3a78f5421908326ec4e5a522a0bc7af3903',
+  sha1 = 'd252a0ac519a2be2f652df8f4b342ea6953ae29a',
   license = 'Apache2.0',
   repository = GERRITFORGE,
 )
diff --git a/src/main/java/com/googlesource/gerrit/plugins/gitblit/GerritGitBlitContext.java b/src/main/java/com/googlesource/gerrit/plugins/gitblit/GerritGitBlitContext.java
index 6e3d101..d32e5e9 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/gitblit/GerritGitBlitContext.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/gitblit/GerritGitBlitContext.java
@@ -60,7 +60,7 @@
 
   void init(ServletContext context) {
     // Manually configure IRuntimeManager
-    runtime.setBaseFolder(sitePaths.site_path);
+    runtime.setBaseFolder(sitePaths.site_path.toFile());
     runtime.getStatus().servletContainer = context.getServerInfo();
     runtime.start();
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/gitblit/app/GitBlitSettings.java b/src/main/java/com/googlesource/gerrit/plugins/gitblit/app/GitBlitSettings.java
index 67a3090..e81ef0d 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/gitblit/app/GitBlitSettings.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/gitblit/app/GitBlitSettings.java
@@ -57,7 +57,7 @@
     this.properties = new Properties();
     this.repoManager = repoManager;
     this.config = new GitBlitUrlsConfig(config);
-    this.etcDir = sitePaths.etc_dir;
+    this.etcDir = sitePaths.etc_dir.toFile();
     load();
   }
 
@@ -77,8 +77,8 @@
     try {
       properties = new Properties();
       properties.load(resin);
-      properties.put("git.repositoriesFolder", repoManager.getBasePath()
-          .getAbsolutePath());
+      properties.put("git.repositoriesFolder",
+          getBasePath().getAbsolutePath());
       properties.put("realm.userService",
           GerritToGitBlitUserService.class.getName());
       if (properties.get("web.otherUrls") != null) {
@@ -112,7 +112,7 @@
   }
 
   public File getBasePath() {
-    return repoManager.getBasePath();
+    return repoManager.getBasePath().toFile();
   }
 
   @Override
diff --git a/src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritToGitBlitUserService.java b/src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritToGitBlitUserService.java
index a4bbb2c..ce74ac6 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritToGitBlitUserService.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritToGitBlitUserService.java
@@ -154,6 +154,11 @@
   }
 
   @Override
+  public UserModel authenticate(String username) {
+    return null;
+  }
+
+  @Override
   public UserModel authenticate(String username, SshKey key) {
     return null;
   }
