diff --git a/lib/application.js b/lib/application.js
index d588fafd..228d4d1a 100644
--- a/lib/application.js
+++ b/lib/application.js
@@ -154,6 +154,8 @@ app.model = function (Model, config) {
 
   if (isPublic && Model.sharedClass) {
     this.remotes().addClass(Model.sharedClass);
+    if (Model.settings.trackChanges && Model.Change)
+      this.remotes().addClass(Model.Change.sharedClass);
     clearHandlerCache(this);
   }
 
diff --git a/lib/models/change.js b/lib/models/change.js
index e66a8453..9f291fdd 100644
--- a/lib/models/change.js
+++ b/lib/models/change.js
@@ -609,7 +609,7 @@ Conflict.prototype.changes = function(cb) {
 Conflict.prototype.resolve = function(cb) {
   var conflict = this;
   conflict.changes(function(err, sourceChange, targetChange) {
-    if(err) return callback(err);
+    if(err) return cb(err);
     sourceChange.prev = targetChange.rev;
     sourceChange.save(cb);
   });