diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa9b4dcb..9ae4fc8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,18 @@
+X.Y.Z Release notes
+=============================================================
+### Breaking changes
+* None.
+
+### Enchancements
+* Improve notification performance for objects with no object or list properties.
+
+### Bug fixes
+* Fix a race condition where closing and immediately reopening a synchronized
+  Realm opened using an admin token user would fail.
+
+### Internal
+* None.
+
 2.0.5 Release notes (2017-11-9)
 =============================================================
 ### Breaking changes
diff --git a/src/js_sync.hpp b/src/js_sync.hpp
index a8cc9001..b04655fd 100644
--- a/src/js_sync.hpp
+++ b/src/js_sync.hpp
@@ -678,15 +678,13 @@ void SyncClass<T>::populate_sync_config(ContextType ctx, ObjectType realm_constr
             is_partial = Value::validated_to_boolean(ctx, partial_value);
         }
 
-        // FIXME - use make_shared
-        config.sync_config = std::shared_ptr<SyncConfig>(new SyncConfig{shared_user, raw_realm_url,
-                                                                        SyncSessionStopPolicy::AfterChangesUploaded,
-                                                                        std::move(bind), std::move(error_handler),
-                                                                        nullptr, util::none,
-                                                                        client_validate_ssl, ssl_trust_certificate_path,
-                                                                        std::move(ssl_verify_callback),
-                                                                        is_partial});
-
+        config.sync_config = std::make_shared<SyncConfig>(shared_user, std::move(raw_realm_url));
+        config.sync_config->bind_session_handler = std::move(bind);
+        config.sync_config->error_handler = std::move(error_handler);
+        config.sync_config->client_validate_ssl = client_validate_ssl;
+        config.sync_config->ssl_trust_certificate_path = ssl_trust_certificate_path;
+        config.sync_config->ssl_verify_callback = std::move(ssl_verify_callback);
+        config.sync_config->is_partial = is_partial;
 
         config.schema_mode = SchemaMode::Additive;
         config.path = syncManagerShared().path_for_realm(*shared_user, config.sync_config->realm_url());
diff --git a/src/object-store b/src/object-store
index d3ab265d..3e333d8f 160000
--- a/src/object-store
+++ b/src/object-store
@@ -1 +1 @@
-Subproject commit d3ab265df6f810a739da91c2e782e0421fdeac9a
+Subproject commit 3e333d8fa081aa88fc2c435a1e328a106d4a1b7e