diff --git a/.discourse-compatibility b/.discourse-compatibility
index fb50b4c..ec3e2a9 100644
--- a/.discourse-compatibility
+++ b/.discourse-compatibility
@@ -1,3 +1,4 @@
+< 3.6.0.beta2-dev: 5680141120fdf50f8fa399294b0f98c10b359007
 < 3.6.0.beta1-dev: 5c8a1a7d7de6d61b0da811966b4fda190d9062cb
 < 3.5.0.beta5-dev: e71a243cfca147d8ac24b504044614ce5fd09cef
 < 3.5.0.beta1-dev: 54a7970fd9ae1609e453199aeba5fe582b5e3672
diff --git a/assets/javascripts/discourse/controllers/team-build-manage.js b/assets/javascripts/discourse/controllers/team-build-manage.js
index c241264..cd4880c 100644
--- a/assets/javascripts/discourse/controllers/team-build-manage.js
+++ b/assets/javascripts/discourse/controllers/team-build-manage.js
@@ -1,6 +1,7 @@
 import Controller from "@ember/controller";
 import { action } from "@ember/object";
 import { sort } from "@ember/object/computed";
+import { removeValueFromArray } from "discourse/lib/array-tools";
 import { Types } from "discourse/plugins/discourse-teambuild/discourse/models/teambuild-target";
 
 export default class TeamBuildManageController extends Controller {
@@ -24,7 +25,7 @@ export default class TeamBuildManageController extends Controller {
     if (this.targets.length > 0) {
       maxPosition = Math.max(...this.targets.map((t) => t.position));
     }
-    this.targets.pushObject(
+    this.targets.push(
       this.store.createRecord("teambuild-target", {
         target_type_id: Types.REGULAR,
         position: maxPosition + 1,
@@ -34,6 +35,6 @@ export default class TeamBuildManageController extends Controller {
 
   @action
   removeTarget(t) {
-    this.targets.removeObject(t);
+    removeValueFromArray(this.targets, t);
   }
 }
diff --git a/assets/javascripts/discourse/routes/team-build-manage.js b/assets/javascripts/discourse/routes/team-build-manage.js
index 73b015b..977d341 100644
--- a/assets/javascripts/discourse/routes/team-build-manage.js
+++ b/assets/javascripts/discourse/routes/team-build-manage.js
@@ -6,6 +6,9 @@ export default class TeamBuildManageRoute extends Route {
   }
 
   setupController(controller, targets) {
-    controller.setProperties({ targets, groups: targets.extras.groups });
+    controller.setProperties({
+      targets: targets.content,
+      groups: targets.extras.groups,
+    });
   }
 }