diff --git a/java/com.sap.sailing.domain.igtimiadapter.gateway/src/com/sap/sailing/domain/igtimiadapter/gateway/oauth/AuthorizationCallback.java b/java/com.sap.sailing.domain.igtimiadapter.gateway/src/com/sap/sailing/domain/igtimiadapter/gateway/oauth/AuthorizationCallback.java
index 25e31165998..26fe9595b54 100644
--- a/java/com.sap.sailing.domain.igtimiadapter.gateway/src/com/sap/sailing/domain/igtimiadapter/gateway/oauth/AuthorizationCallback.java
+++ b/java/com.sap.sailing.domain.igtimiadapter.gateway/src/com/sap/sailing/domain/igtimiadapter/gateway/oauth/AuthorizationCallback.java
@@ -26,12 +26,11 @@ import com.sap.sailing.domain.igtimiadapter.impl.IgtimiConnectionFactoryImpl;
 import com.sap.sse.security.SecurityService;
 import com.sap.sse.security.shared.impl.User;
 
-@Path(AuthorizationCallback.V1)
+@Path(RestApiApplication.V1)
 public class AuthorizationCallback {
     private static final Logger logger = Logger.getLogger(AuthorizationCallback.class.getName());
     
     private static final String AUTHORIZATIONCALLBACK = "/authorizationcallback";
-    static final String V1 = "/v1";
     private final IgtimiConnectionFactoryImpl connectionFactory;
     
     public AuthorizationCallback() throws ClientProtocolException, IllegalStateException, IOException, ParseException {
diff --git a/java/com.sap.sailing.domain.igtimiadapter.gateway/src/com/sap/sailing/domain/igtimiadapter/gateway/oauth/RestApiApplication.java b/java/com.sap.sailing.domain.igtimiadapter.gateway/src/com/sap/sailing/domain/igtimiadapter/gateway/oauth/RestApiApplication.java
index 3e05134f28f..e689e947191 100644
--- a/java/com.sap.sailing.domain.igtimiadapter.gateway/src/com/sap/sailing/domain/igtimiadapter/gateway/oauth/RestApiApplication.java
+++ b/java/com.sap.sailing.domain.igtimiadapter.gateway/src/com/sap/sailing/domain/igtimiadapter/gateway/oauth/RestApiApplication.java
@@ -9,6 +9,8 @@ import javax.ws.rs.core.Application;
 import com.sap.sse.security.jaxrs.ShiroAuthorizationExceptionTo401ResponseMapper;
 
 public class RestApiApplication extends Application {
+    static final String V1 = "/v1";
+
     public RestApiApplication() {
     }
 
diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.racelogtrackingadapter/META-INF/MANIFEST.MF
index e7c148d41a1..5e7af212217 100644
--- a/java/com.sap.sailing.domain.racelogtrackingadapter/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.domain.racelogtrackingadapter/META-INF/MANIFEST.MF
@@ -23,7 +23,8 @@ Require-Bundle: com.sap.sailing.domain,
  org.mongodb.driver-core;bundle-version="4.3.1",
  org.mongodb.driver-sync;bundle-version="4.3.1",
  com.sap.sailing.shared.persistence;bundle-version="1.0.0",
- com.sap.sse.shared.android
+ com.sap.sse.shared.android,
+ com.sap.sse.operationaltransformation
 Import-Package: com.google.zxing;version="3.1.0",
  com.mongodb,
  com.sap.sse.concurrent,
diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy).launch b/java/com.sap.sailing.server/SailingServer (No Proxy).launch
index 84813d04c40..4a5755a1913 100755
--- a/java/com.sap.sailing.server/SailingServer (No Proxy).launch	
+++ b/java/com.sap.sailing.server/SailingServer (No Proxy).launch	
@@ -58,6 +58,7 @@
         <setEntry value="com.github.mwiede.jsch@default:default"/>
         <setEntry value="com.google.gson.source"/>
         <setEntry value="com.google.gson@default:default"/>
+        <setEntry value="com.google.protobuf@default:default"/>
         <setEntry value="com.rabbitmq.client.source"/>
         <setEntry value="com.rabbitmq.client@default:default"/>
         <setEntry value="com.sap.db.jdbc.source"/>
diff --git a/java/com.sap.sse.mail.replication.test/META-INF/MANIFEST.MF b/java/com.sap.sse.mail.replication.test/META-INF/MANIFEST.MF
index 66bda7b2966..ea0f86eb302 100644
--- a/java/com.sap.sse.mail.replication.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.mail.replication.test/META-INF/MANIFEST.MF
@@ -11,5 +11,6 @@ Require-Bundle: org.hamcrest;bundle-version="2.2.0",
  com.rabbitmq.client,
  com.sap.sse.replication.testsupport,
  com.sap.sse.mail.replication.testsupport,
- com.sap.sse.replication.interfaces;bundle-version="1.0.0"
+ com.sap.sse.replication.interfaces,
+ com.sap.sse.replication
 Automatic-Module-Name: com.sap.sse.mail.replication.test
diff --git a/java/com.sap.sse.mongodb/src/com/sap/sse/mongodb/internal/MongoDBServiceImpl.java b/java/com.sap.sse.mongodb/src/com/sap/sse/mongodb/internal/MongoDBServiceImpl.java
index 1cfbf6de444..8e66cb0de1d 100644
--- a/java/com.sap.sse.mongodb/src/com/sap/sse/mongodb/internal/MongoDBServiceImpl.java
+++ b/java/com.sap.sse.mongodb/src/com/sap/sse/mongodb/internal/MongoDBServiceImpl.java
@@ -142,7 +142,6 @@ public class MongoDBServiceImpl implements MongoDBService {
 
     @Override
     public MongoClient getMongo(ConnectionString mongoConnectionString) {
-        @SuppressWarnings("resource")
         MongoClient mongo = mongos.computeIfAbsent(mongoConnectionString,
                 k-> MongoClients.create(mongoConnectionString));
         return mongo;