diff --git a/binding.gyp b/binding.gyp
index afc0e146..4a822e68 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -68,7 +68,7 @@
       "conditions": [
         ["OS=='linux'", {
           "sources": [
-            "src/object-store/src/impl/android/external_commit_helper.cpp",
+            "src/object-store/src/impl/epoll/external_commit_helper.cpp",
           ]
         }],
         ["OS=='mac'", {
diff --git a/src/js_realm.hpp b/src/js_realm.hpp
index 013c4e6c..86ed3e04 100644
--- a/src/js_realm.hpp
+++ b/src/js_realm.hpp
@@ -62,7 +62,9 @@ class RealmDelegate : public BindingContext {
     using ObjectDefaultsMap = typename Schema<T>::ObjectDefaultsMap;
     using ConstructorMap = typename Schema<T>::ConstructorMap;
 
-    virtual void did_change(std::vector<ObserverState> const& observers, std::vector<void*> const& invalidated) {
+    virtual void did_change(std::vector<ObserverState> const& observers,
+                            std::vector<void*> const& invalidated,
+                            bool version_changed=true) {
         notify("change");
     }
     virtual std::vector<ObserverState> get_observed_rows() {
diff --git a/src/js_sync.hpp b/src/js_sync.hpp
index 253ef85c..5b0cdf01 100644
--- a/src/js_sync.hpp
+++ b/src/js_sync.hpp
@@ -302,8 +302,7 @@ void SyncClass<T>::populate_sync_config(ContextType ctx, ObjectType realm_constr
         std::string raw_realm_url = Object::validated_get_string(ctx, sync_config_object, "url");
 
         // FIXME - use make_shared
-        config.sync_config = std::shared_ptr<SyncConfig>(
-            new SyncConfig(shared_user, raw_realm_url, SyncSessionStopPolicy::AfterChangesUploaded, handler)
+        config.sync_config = std::shared_ptr<SyncConfig>(new SyncConfig{shared_user, raw_realm_url, SyncSessionStopPolicy::AfterChangesUploaded, handler, [=](int error_code, std::string message, SyncSessionError) {}}
         );
         config.schema_mode = SchemaMode::Additive;
         config.path = realm::SyncManager::shared().path_for_realm(shared_user->identity(), raw_realm_url);
diff --git a/src/object-store b/src/object-store
index aa6b8ee6..ddf845eb 160000
--- a/src/object-store
+++ b/src/object-store
@@ -1 +1 @@
-Subproject commit aa6b8ee613e79c664bc59717ac84de8b33619594
+Subproject commit ddf845eb23884f6644d15c896952ee0f5ea5ad57